From 99cf9b366b2d812383d688bf75b302d7dc6ec0e3 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:57:57 -0700
Subject: [PATCH 1/3] Deprecate `--module amd`, `umd`, `system`, `none`;
 `--moduleResolution classic`; change defaults (#62669)

---
 src/compiler/commandLineParser.ts             |    5 +-
 src/compiler/diagnosticMessages.json          |    2 +-
 src/compiler/program.ts                       |    6 +
 src/compiler/types.ts                         |    5 +
 src/compiler/utilities.ts                     |   40 +-
 src/services/completions.ts                   |   10 +-
 .../evaluation/awaitUsingDeclarations.ts      |    2 +-
 .../evaluation/updateExpressionInModule.ts    |    8 +-
 .../unittests/evaluation/usingDeclarations.ts |    4 +-
 .../unittests/tscWatch/incremental.ts         |    5 +-
 ...ModuleForStatementNoInitializer.errors.txt |   22 +
 .../aliasesInSystemModule1.errors.txt         |    2 +
 .../aliasesInSystemModule2.errors.txt         |    2 +
 ...sions(moduleresolution=classic).errors.txt |    2 +
 ...false,moduleresolution=classic).errors.txt |   19 +
 ...=true,moduleresolution=classic).errors.txt |   19 +
 .../allowSyntheticDefaultImports2.errors.txt  |   12 +
 .../allowSyntheticDefaultImports3.errors.txt  |   14 +
 .../allowSyntheticDefaultImports5.errors.txt  |   14 +
 .../allowSyntheticDefaultImports6.errors.txt  |   14 +
 .../allowSyntheticDefaultImports7.errors.txt  |   13 +
 .../allowSyntheticDefaultImports7.types       |    2 +
 .../allowSyntheticDefaultImports8.errors.txt  |   14 +
 ...alModuleInAnotherExternalModule.errors.txt |    4 +-
 ...ntExternalModuleInAnotherExternalModule.js |   22 +-
 ...nalModuleInsideNonAmbientExternalModule.js |    6 +-
 .../ambientExternalModuleMerging.errors.txt   |   19 +
 ...leWithInternalImportDeclaration.errors.txt |   21 +
 ...ithoutInternalImportDeclaration.errors.txt |   20 +
 ...tInsideNonAmbientExternalModule.errors.txt |   10 +
 ...mbientInsideNonAmbientExternalModule.types |    1 +
 ...mdDeclarationEmitNoExtraDeclare.errors.txt |   24 +
 .../amdDeclarationEmitNoExtraDeclare.types    |    1 +
 .../amdDependencyComment2.errors.txt          |    2 +
 .../amdDependencyCommentName2.errors.txt      |    2 +
 .../amdDependencyCommentName3.errors.txt      |    2 +
 .../amdDependencyCommentName4.errors.txt      |   14 +
 .../amdImportAsPrimaryExpression.errors.txt   |   15 +
 ...amdImportNotAsPrimaryExpression.errors.txt |   34 +
 ...uplicateDeclarationEmitComments.errors.txt |   10 +
 .../amdModuleConstEnumUsage.errors.txt        |   21 +
 .../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 +
 ...Identifiers_module(module=none).errors.txt |    2 +
 ...entifiers_module(module=system).errors.txt |    2 +
 ...eIdentifiers_module(module=umd).errors.txt |    2 +
 ...syncAwaitIsolatedModules_es2017.errors.txt |    4 +-
 .../asyncAwaitIsolatedModules_es6.errors.txt  |    4 +-
 .../reference/augmentExportEquals1.js         |   25 +-
 .../augmentExportEquals1_1.errors.txt         |    2 +
 .../reference/augmentExportEquals2.js         |   25 +-
 .../augmentExportEquals2_1.errors.txt         |    2 +
 .../reference/augmentExportEquals3.js         |  106 +-
 .../augmentExportEquals3_1.errors.txt         |   30 +
 .../reference/augmentExportEquals3_1.types    |    1 +
 .../reference/augmentExportEquals4.js         |  116 +-
 .../augmentExportEquals4_1.errors.txt         |   30 +
 .../reference/augmentExportEquals4_1.types    |    1 +
 .../reference/augmentExportEquals5.js         |   21 +-
 .../reference/augmentExportEquals6.js         |  134 +-
 .../augmentExportEquals6_1.errors.txt         |   28 +
 .../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 +
 .../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 |   10 +
 ...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 +-
 .../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 +
 ...llyTypedStringLiteralsInJsxAttributes02.js |   49 +
 .../copyrightWithNewLine1.errors.txt          |    4 +-
 .../reference/copyrightWithNewLine1.js        |   15 +-
 .../copyrightWithoutNewLine1.errors.txt       |    4 +-
 .../reference/copyrightWithoutNewLine1.js     |   18 +-
 .../crashIntypeCheckInvocationExpression.js   |   23 +
 ...peCheckObjectCreationExpression.errors.txt |    2 +
 ...ortAssignmentOfGenericInterface.errors.txt |   14 +
 .../declFileExportImportChain.errors.txt      |   26 +
 .../declFileExportImportChain2.errors.txt     |   23 +
 ...declarationEmitAmdModuleDefault.errors.txt |    6 +
 ...ationEmitAmdModuleNameDirective.errors.txt |   11 +
 ...EmitBundleWithAmbientReferences.errors.txt |   23 +
 ...mitDefaultExportWithTempVarName.errors.txt |    6 +
 ...portWithTempVarNameWithBundling.errors.txt |    6 +
 ...PrefersPathKindBasedOnBundling2.errors.txt |   26 +
 .../declarationMapsOutFile.errors.txt         |   22 +
 .../reference/declarationMerging2.errors.txt  |   17 +
 .../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 +
 .../deduplicateImportsInSystem.errors.txt     |    2 +
 ...efaultExportInAwaitExpression01.errors.txt |   15 +
 .../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      |   89 ++
 .../duplicateSymbolsExportMatching.js         |   80 ++
 ...amicImportWithNestedThis_es2015.errors.txt |   16 +
 ...dynamicImportWithNestedThis_es5.errors.txt |   16 +
 .../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 +
 ...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 +
 ...ithImplicitModuleResolutionNone.errors.txt |    4 +-
 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          |   64 +
 .../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/es6ImportDefaultBinding.js      |    6 +-
 .../reference/es6ImportDefaultBinding.symbols |    4 +-
 .../reference/es6ImportDefaultBinding.types   |    4 +-
 .../es6ImportDefaultBindingAmd.errors.txt     |   13 +
 ...BindingFollowedWithNamedImport1.errors.txt |   36 +-
 ...tDefaultBindingFollowedWithNamedImport1.js |   24 +-
 ...ultBindingFollowedWithNamedImport1.symbols |   12 +-
 ...faultBindingFollowedWithNamedImport1.types |   12 +-
 ...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 +-
 ...WithNamespaceBinding1WithExport.errors.txt |    4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |   14 +-
 ...wedWithNamespaceBinding1WithExport.symbols |    2 +-
 ...lowedWithNamespaceBinding1WithExport.types |    2 +-
 ...ollowedWithNamespaceBindingDts1.errors.txt |   11 +
 ...BindingFollowedWithNamespaceBindingDts1.js |   16 +-
 ...ngFollowedWithNamespaceBindingDts1.symbols |    2 +-
 ...dingFollowedWithNamespaceBindingDts1.types |    2 +-
 ...6ImportDefaultBindingWithExport.errors.txt |    4 +-
 .../es6ImportDefaultBindingWithExport.js      |   32 +-
 .../es6ImportDefaultBindingWithExport.symbols |    4 +-
 .../es6ImportDefaultBindingWithExport.types   |    4 +-
 .../es6ImportEqualsDeclaration.errors.txt     |    4 +-
 .../reference/es6ImportEqualsDeclaration.js   |    2 +-
 .../es6ImportEqualsDeclaration.symbols        |    2 +-
 .../es6ImportEqualsDeclaration.types          |    2 +-
 .../es6ImportNameSpaceImportAmd.errors.txt    |   12 +
 ...ImportNameSpaceImportWithExport.errors.txt |    2 +
 .../es6ImportNamedImportAmd.errors.txt        |   43 +
 ...rtNamedImportIdentifiersParsing.errors.txt |   20 +-
 ...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 +
 ...esnextmodulekindWithES5Target10.errors.txt |    4 +-
 .../esnextmodulekindWithES5Target9.errors.txt |   20 +-
 .../exportAndImport-es5-amd.errors.txt        |   14 +
 .../exportAsNamespace1(module=amd).errors.txt |    2 +
 ...portAsNamespace1(module=system).errors.txt |    2 +
 .../exportAsNamespace1(module=umd).errors.txt |    2 +
 .../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 +
 .../exportAsNamespace_nonExistent.errors.txt  |    4 +-
 ...ortAssignedTypeAsTypeAnnotation.errors.txt |   16 +
 .../exportAssignmentAndDeclaration.js         |   31 +-
 ...exportAssignmentCircularModules.errors.txt |   25 +
 .../exportAssignmentCircularModules.types     |    6 +
 .../exportAssignmentClass.errors.txt          |   14 +
 .../exportAssignmentError.errors.txt          |   13 +
 .../reference/exportAssignmentError.types     |    1 +
 .../exportAssignmentFunction.errors.txt       |   13 +
 .../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 +
 .../exportClassNameWithObjectAMD.errors.txt   |    2 +
 ...exportClassNameWithObjectSystem.errors.txt |    2 +
 .../exportClassNameWithObjectUMD.errors.txt   |    2 +
 ...MemberOfSameName(module=system).errors.txt |   19 +
 .../reference/exportDeclareClass1.js          |   10 +-
 .../exportDefaultAsyncFunction2.errors.txt    |    8 +-
 .../reference/exportDefaultAsyncFunction2.js  |   16 +-
 .../exportDefaultAsyncFunction2.symbols       |    8 +-
 .../exportDefaultAsyncFunction2.types         |    8 +-
 ...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/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 +
 ...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 +
 .../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 +
 .../exportedBlockScopedDeclarations.js        |   45 +
 ...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 +
 .../exportsInAmbientModules1.errors.txt       |   11 +
 .../exportsInAmbientModules2.errors.txt       |   11 +
 ...ority(moduleresolution=classic).errors.txt |   20 +
 .../externalModuleAssignToVar.errors.txt      |   29 +
 ...rtDeclarationWithExportModifier.errors.txt |   11 +
 .../reference/fieldAndGetterWithSameName.js   |   34 +
 ...tingIntoSameOutputWithOutOption.errors.txt |   12 +
 .../generatorES6InAMDModule.errors.txt        |    8 +
 .../reference/generatorES6InAMDModule.types   |    1 +
 .../genericClassesInModule2.errors.txt        |   25 +
 ...cInterfaceFunctionTypeParameter.errors.txt |   12 +
 .../reference/genericMemberFunction.js        |   77 ++
 ...rsiveImplicitConstructorErrors1.errors.txt |    2 +
 .../reference/genericReturnTypeFromGetter1.js |   36 +
 .../genericTypeWithMultipleBases2.errors.txt  |   23 +
 ...WithIndexerOfTypeParameterType2.errors.txt |   19 +
 tests/baselines/reference/giant.js            |  750 ++++++++++-
 ...liedNodeFormatEmit1(module=amd).errors.txt |    2 +
 ...dNodeFormatEmit1(module=system).errors.txt |    2 +
 ...liedNodeFormatEmit1(module=umd).errors.txt |    2 +
 ...importCallExpressionAsyncES5AMD.errors.txt |   33 +
 ...ortCallExpressionAsyncES5System.errors.txt |   33 +
 ...importCallExpressionAsyncES5UMD.errors.txt |   33 +
 ...importCallExpressionAsyncES6AMD.errors.txt |   33 +
 ...ortCallExpressionAsyncES6System.errors.txt |   33 +
 ...importCallExpressionAsyncES6UMD.errors.txt |   33 +
 .../importCallExpressionES5AMD.errors.txt     |   31 +
 .../importCallExpressionES5System.errors.txt  |   31 +
 .../importCallExpressionES5UMD.errors.txt     |   31 +
 .../importCallExpressionES6AMD.errors.txt     |   31 +
 .../importCallExpressionES6System.errors.txt  |   31 +
 .../importCallExpressionES6UMD.errors.txt     |   31 +
 .../importCallExpressionInAMD1.errors.txt     |   19 +
 .../importCallExpressionInAMD2.errors.txt     |   19 +
 .../importCallExpressionInAMD2.types          |    6 +
 .../importCallExpressionInAMD3.errors.txt     |   16 +
 .../importCallExpressionInAMD4.errors.txt     |   43 +
 .../importCallExpressionInAMD4.types          |   17 +
 ...CallExpressionInExportEqualsAMD.errors.txt |   11 +
 ...CallExpressionInExportEqualsUMD.errors.txt |   11 +
 .../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 +
 .../importCallExpressionInUMD2.errors.txt     |   19 +
 .../importCallExpressionInUMD2.types          |    6 +
 .../importCallExpressionInUMD3.errors.txt     |   16 +
 .../importCallExpressionInUMD4.errors.txt     |   43 +
 .../importCallExpressionInUMD4.types          |   17 +
 .../importCallExpressionInUMD5.errors.txt     |   14 +
 .../importCallExpressionInUMD5.types          |    2 +
 .../importCallExpressionNestedAMD.errors.txt  |   11 +
 .../importCallExpressionNestedAMD.types       |    1 +
 .../importCallExpressionNestedAMD2.errors.txt |   11 +
 .../importCallExpressionNestedAMD2.types      |    1 +
 ...mportCallExpressionNestedSystem.errors.txt |   11 +
 .../importCallExpressionNestedSystem.types    |    1 +
 ...portCallExpressionNestedSystem2.errors.txt |   11 +
 .../importCallExpressionNestedSystem2.types   |    1 +
 .../importCallExpressionNestedUMD.errors.txt  |   11 +
 .../importCallExpressionNestedUMD.types       |    1 +
 .../importCallExpressionNestedUMD2.errors.txt |   11 +
 .../importCallExpressionNestedUMD2.types      |    1 +
 .../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 +-
 .../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/importHelpers.js    |    2 +-
 .../baselines/reference/importHelpers.symbols |   88 +-
 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    |   82 +-
 .../importHelpersInIsolatedModules.types      |    2 +-
 .../baselines/reference/importHelpersInTsx.js |    2 +-
 .../reference/importHelpersInTsx.symbols      |   82 +-
 .../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 +
 ...uleinterop=false,module=system).errors.txt |   16 +
 ...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 +
 ...uleinterop=false,module=system).errors.txt |   19 +
 ...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 +
 ...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 +
 ...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 +
 ...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 +
 ...uleinterop=false,module=system).errors.txt |   17 +
 ...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 |   12 +
 ...ta(module=system,target=esnext).errors.txt |   12 +
 ...ortMetaNarrowing(module=system).errors.txt |   11 +
 .../reference/importNonExternalModule.js      |   13 +-
 .../importShadowsGlobalName.errors.txt        |   12 +
 .../importTypeAmdBundleRewrite.errors.txt     |   16 +
 ...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 +-
 .../importsInAmbientModules1.errors.txt       |   11 +
 .../importsInAmbientModules2.errors.txt       |   11 +
 .../importsInAmbientModules3.errors.txt       |   11 +
 .../instanceOfInExternalModules.errors.txt    |   14 +
 .../instanceOfInExternalModules.types         |    2 +
 .../reference/interfaceDeclaration3.js        |  134 ++
 .../interfaceDeclaration5.errors.txt          |    8 +
 .../reference/interfaceImplementation6.js     |   58 +
 ...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 +
 ...SyntaxNamespaceImportWithSystem.errors.txt |    2 +
 .../isolatedDeclarationOutFile.errors.txt     |   24 +
 .../isolatedModulesPlainFile-AMD.errors.txt   |    8 +
 ...isolatedModulesPlainFile-System.errors.txt |    8 +
 .../isolatedModulesPlainFile-UMD.errors.txt   |    8 +
 ...jsDeclarationsImportTypeBundled.errors.txt |   17 +
 ...mpilationRestParamJsDocFunction.errors.txt |   28 +
 ...ileCompilationRestParamJsDocFunction.types |   17 +
 ...FactoryReference(jsx=react-jsx).errors.txt |    4 +-
 ...toryReference(jsx=react-jsxdev).errors.txt |    4 +-
 .../reference/keepImportsInDts1.errors.txt    |    8 +
 .../reference/keepImportsInDts2.errors.txt    |    8 +
 .../reference/keepImportsInDts3.errors.txt    |    9 +
 .../reference/keepImportsInDts4.errors.txt    |    9 +
 ...larationNoCrash1(module=system).errors.txt |    2 +
 ...bReferenceDeclarationEmitBundle.errors.txt |   12 +
 .../libReferenceNoLibBundle.errors.txt        |   20 +
 ...berAccessMustUseModuleInstances.errors.txt |   17 +
 .../reference/mergedDeclarations6.errors.txt  |   25 +
 .../reference/mergedDeclarations6.types       |    5 +
 .../moduleAliasAsFunctionArgument.errors.txt  |   17 +
 ...onCollidingNamesInAugmentation1.errors.txt |   35 +
 ...ntationCollidingNamesInAugmentation1.types |    6 +
 .../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 +
 .../moduleAugmentationsImports4.errors.txt    |   50 +
 tests/baselines/reference/moduleExports1.js   |   52 +
 ...ImportedForTypeArgumentPosition.errors.txt |   14 +
 .../moduleMergeConstructor.errors.txt         |   29 +
 ...oneDynamicImport(target=es2015).errors.txt |   10 +
 ...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 +
 ...duleResolution_classicPrefersTs.errors.txt |   13 +
 .../nestedRedeclarationInES6AMD.errors.txt    |   11 +
 .../noBundledEmitFromNodeModules.errors.txt   |    2 +
 ...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/objectIndexer.errors.txt        |   20 +
 tests/baselines/reference/objectIndexer.types |    1 +
 .../outFilerootDirModuleNamesAmd.errors.txt   |   15 +
 ...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 |   17 +
 ...gBasedModuleResolution3_classic.errors.txt |   25 +
 ...gBasedModuleResolution4_classic.errors.txt |   35 +
 ...gBasedModuleResolution5_classic.errors.txt |   49 +
 ...gBasedModuleResolution6_classic.errors.txt |   25 +
 ...appingBasedModuleResolution6_classic.types |    1 +
 ...gBasedModuleResolution7_classic.errors.txt |   57 +
 ...gBasedModuleResolution8_classic.errors.txt |   31 +
 ...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 |   84 +-
 ...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 +-
 ...MetadataCommonJSISolatedModules.errors.txt |    5 +-
 ...ommonJSISolatedModulesNoResolve.errors.txt |    8 +-
 ...ommonJSISolatedModulesNoResolve.errors.txt |    5 +-
 .../emitDecoratorMetadataSystemJS.errors.txt  |    8 +-
 .../emitDecoratorMetadataSystemJS.errors.txt  |    5 +-
 ...MetadataSystemJSISolatedModules.errors.txt |    8 +-
 ...MetadataSystemJSISolatedModules.errors.txt |    5 +-
 ...ystemJSISolatedModulesNoResolve.errors.txt |    8 +-
 ...ystemJSISolatedModulesNoResolve.errors.txt |    5 +-
 .../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/nodeModulesImportHigher.errors.txt    |    5 +-
 .../nodeModulesMaxDepthExceeded.errors.txt    |    5 +-
 .../nodeModulesMaxDepthIncreased.errors.txt   |    5 +-
 .../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 +
 .../propertyIdentityWithPrivacyMismatch.js    |   38 +
 ...rtAssignmentAndFindAliasedType1.errors.txt |    2 +-
 ...siveExportAssignmentAndFindAliasedType1.js |   27 +-
 ...xportAssignmentAndFindAliasedType1.symbols |    2 +-
 ...eExportAssignmentAndFindAliasedType1.types |    2 +-
 ...rtAssignmentAndFindAliasedType2.errors.txt |    2 +-
 ...siveExportAssignmentAndFindAliasedType2.js |   27 +-
 ...xportAssignmentAndFindAliasedType2.symbols |    2 +-
 ...eExportAssignmentAndFindAliasedType2.types |    2 +-
 ...rtAssignmentAndFindAliasedType3.errors.txt |    2 +-
 ...siveExportAssignmentAndFindAliasedType3.js |   27 +-
 ...xportAssignmentAndFindAliasedType3.symbols |    2 +-
 ...eExportAssignmentAndFindAliasedType3.types |    2 +-
 ...rtAssignmentAndFindAliasedType4.errors.txt |    8 +-
 ...siveExportAssignmentAndFindAliasedType4.js |   38 +-
 ...xportAssignmentAndFindAliasedType4.symbols |   10 +-
 ...eExportAssignmentAndFindAliasedType4.types |    6 +-
 ...rtAssignmentAndFindAliasedType5.errors.txt |   10 +-
 ...siveExportAssignmentAndFindAliasedType5.js |   47 +-
 ...xportAssignmentAndFindAliasedType5.symbols |   12 +-
 ...eExportAssignmentAndFindAliasedType5.types |    8 +-
 ...rtAssignmentAndFindAliasedType6.errors.txt |   12 +-
 ...siveExportAssignmentAndFindAliasedType6.js |   56 +-
 ...xportAssignmentAndFindAliasedType6.symbols |   14 +-
 ...eExportAssignmentAndFindAliasedType6.types |   10 +-
 ...siveExportAssignmentAndFindAliasedType7.js |   58 +-
 ...xportAssignmentAndFindAliasedType7.symbols |   14 +-
 ...eExportAssignmentAndFindAliasedType7.types |   10 +-
 .../reexportMissingDefault5.errors.txt        |   11 +
 ...elativeNamesInClassicResolution.errors.txt |    2 +
 .../relativePathToDeclarationFile.errors.txt  |   29 +
 .../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 +
 .../change-affects-imports.js                 |   28 +-
 .../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 +
 .../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 +
 .../staticInstanceResolution5.errors.txt      |    2 +-
 .../reference/staticInstanceResolution5.js    |   50 +-
 .../staticInstanceResolution5.symbols         |    2 +-
 .../reference/staticInstanceResolution5.types |    2 +-
 ...rictModeWordInImportDeclaration.errors.txt |   12 +-
 ...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        |    8 +
 ...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  |   14 +
 .../topLevelVarHoistingSystem.errors.txt      |   14 +
 ...en transpile with System option.errors.txt |    2 +
 ...with System option.oldTranspile.errors.txt |    2 +
 .../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       |  135 +-
 .../prepend-reports-deprecation-error.js      |   98 +-
 ...e-resolution-finds-original-source-file.js |   79 +-
 .../different-options-with-incremental.js     |  655 ++++++++-
 .../commandLine/outFile/different-options.js  |  590 +++++++-
 ...ndline-with-declaration-and-incremental.js |  350 ++++-
 ...y-false-on-commandline-with-declaration.js |  231 +++-
 ...mitDeclarationOnly-false-on-commandline.js |  582 +++++++-
 ...ndline-with-declaration-and-incremental.js |  535 +++++++-
 ...ionOnly-on-commandline-with-declaration.js |  277 ++--
 .../emitDeclarationOnly-on-commandline.js     | 1182 +++++++++++++++--
 ...tax-errors-in-config-file-discrepancies.js |    2 -
 .../reports-syntax-errors-in-config-file.js   |  137 +-
 ...-dts-generation-errors-with-incremental.js |   40 +-
 .../outFile/reports-dts-generation-errors.js  |   14 +-
 .../outFile/deleted-file-without-composite.js |   23 +-
 .../outFile/detects-deleted-file.js           |  138 +-
 .../outFile/dts-errors-discrepancies.js       |    3 +
 .../outFile/dts-errors-with-incremental.js    |  309 ++++-
 .../tsbuild/noCheck/outFile/dts-errors.js     |  225 ++--
 .../outFile/semantic-errors-discrepancies.js  |    3 +
 .../semantic-errors-with-incremental.js       |  321 ++++-
 .../noCheck/outFile/semantic-errors.js        |  208 ++-
 .../outFile/syntax-errors-discrepancies.js    |    3 +
 .../outFile/syntax-errors-with-incremental.js |  250 +++-
 .../tsbuild/noCheck/outFile/syntax-errors.js  |  185 +--
 .../noEmit/outFile/changes-composite.js       |  587 ++++----
 .../changes-incremental-declaration.js        |  587 ++++----
 .../noEmit/outFile/changes-incremental.js     |  587 ++++----
 .../changes-with-initial-noEmit-composite.js  |  303 +++--
 ...-initial-noEmit-incremental-declaration.js |  303 +++--
 ...changes-with-initial-noEmit-incremental.js |  303 +++--
 ...th-incremental-as-modules-discrepancies.js |   57 +-
 ...ble-changes-with-incremental-as-modules.js |  388 ++++--
 ...tion-enable-changes-with-multiple-files.js |  668 ++++------
 ...th-incremental-as-modules-discrepancies.js |  103 ++
 .../dts-errors-with-incremental-as-modules.js |  325 +++--
 ...dts-enabled-with-incremental-as-modules.js |  322 ++++-
 ...ntic-errors-with-incremental-as-modules.js |  288 ++--
 ...ntax-errors-with-incremental-as-modules.js |  148 ++-
 ...rrors-with-declaration-with-incremental.js |  173 ++-
 .../outFile/dts-errors-with-declaration.js    |  137 +-
 .../outFile/dts-errors-with-incremental.js    |  160 ++-
 .../noEmitOnError/outFile/dts-errors.js       |  141 +-
 ...rrors-with-declaration-with-incremental.js |  113 +-
 .../semantic-errors-with-declaration.js       |  117 +-
 .../semantic-errors-with-incremental.js       |  100 +-
 .../noEmitOnError/outFile/semantic-errors.js  |  104 +-
 ...rrors-with-declaration-with-incremental.js |  115 +-
 .../outFile/syntax-errors-with-declaration.js |  119 +-
 .../outFile/syntax-errors-with-incremental.js |  102 +-
 .../noEmitOnError/outFile/syntax-errors.js    |  106 +-
 .../non-module-projects-without-prepend.js    |  118 +-
 ...hen-module-option-changes-discrepancies.js |   76 ++
 .../sample1/when-module-option-changes.js     |   23 +-
 ...roject-uses-different-module-resolution.js |   41 +
 .../reports-syntax-errors-in-config-file.js   |  146 +-
 ...se-different-module-resolution-settings.js |   50 +-
 .../dts-errors-with-incremental-as-modules.js |  243 ++--
 ...dts-enabled-with-incremental-as-modules.js |  185 ++-
 ...ntic-errors-with-incremental-as-modules.js |  213 +--
 ...ntax-errors-with-incremental-as-modules.js |   81 +-
 ...Error-with-declaration-with-incremental.js |  382 +++++-
 .../outFile/noEmitOnError-with-declaration.js |  295 +++-
 .../outFile/noEmitOnError-with-incremental.js |  350 ++++-
 .../noEmitOnError/outFile/noEmitOnError.js    |  227 +++-
 ...does-not-add-color-when-NO_COLOR-is-set.js |    2 +-
 .../reference/tsc/commandLine/help-all.js     |    6 +-
 .../reference/tsc/commandLine/help.js         |    2 +-
 ...-when-host-can't-provide-terminal-width.js |    2 +-
 ...tatus.DiagnosticsPresent_OutputsSkipped.js |    2 +-
 .../tsc/composite/converting-to-modules.js    |   32 +-
 ...-dts-generation-errors-with-incremental.js |   53 +-
 .../outFile/reports-dts-generation-errors.js  |   27 +-
 .../different-options-with-incremental.js     |  552 +++++++-
 .../incremental/outFile/different-options.js  |  530 +++++++-
 ...to-the-referenced-project-discrepancies.js |   67 +-
 ...file-is-added-to-the-referenced-project.js |  626 ++++++++-
 ...s-errors-with-incremental-discrepancies.js |  120 +-
 .../outFile/dts-errors-with-incremental.js    |  519 +++++++-
 .../tsc/noCheck/outFile/dts-errors.js         |  174 ++-
 ...c-errors-with-incremental-discrepancies.js |  120 +-
 .../semantic-errors-with-incremental.js       |  521 ++++++--
 .../tsc/noCheck/outFile/semantic-errors.js    |  172 ++-
 ...x-errors-with-incremental-discrepancies.js |  120 +-
 .../outFile/syntax-errors-with-incremental.js |  428 +++++-
 .../tsc/noCheck/outFile/syntax-errors.js      |  114 +-
 .../tsc/noEmit/outFile/changes-composite.js   |  620 ++++-----
 .../changes-incremental-declaration.js        |  620 ++++-----
 .../tsc/noEmit/outFile/changes-incremental.js |  620 ++++-----
 .../changes-with-initial-noEmit-composite.js  |  311 +++--
 ...-initial-noEmit-incremental-declaration.js |  311 +++--
 ...changes-with-initial-noEmit-incremental.js |  311 +++--
 ...tion-enable-changes-with-multiple-files.js |  623 +++------
 ...th-incremental-as-modules-discrepancies.js |  103 ++
 .../dts-errors-with-incremental-as-modules.js |  282 ++--
 ...dts-enabled-with-incremental-as-modules.js |  218 ++-
 ...ntic-errors-with-incremental-as-modules.js |  246 ++--
 ...ntax-errors-with-incremental-as-modules.js |   96 +-
 ...rrors-with-declaration-with-incremental.js |  148 ++-
 .../outFile/dts-errors-with-declaration.js    |   93 +-
 .../outFile/dts-errors-with-incremental.js    |  102 +-
 .../tsc/noEmitOnError/outFile/dts-errors.js   |   70 +-
 ...-before-fixing-error-with-noEmitOnError.js |   20 +-
 ...rrors-with-declaration-with-incremental.js |   90 +-
 .../semantic-errors-with-declaration.js       |   75 +-
 .../semantic-errors-with-incremental.js       |   78 +-
 .../noEmitOnError/outFile/semantic-errors.js  |   62 +-
 ...rrors-with-declaration-with-incremental.js |   92 +-
 .../outFile/syntax-errors-with-declaration.js |   77 +-
 .../outFile/syntax-errors-with-incremental.js |   80 +-
 .../noEmitOnError/outFile/syntax-errors.js    |   64 +-
 ...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 +-
 .../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 +-
 .../dts-errors-with-incremental-as-modules.js |  237 ++--
 ...dts-enabled-with-incremental-as-modules.js |  173 ++-
 ...ntic-errors-with-incremental-as-modules.js |  207 +--
 ...ntax-errors-with-incremental-as-modules.js |   75 +-
 ...Error-with-declaration-with-incremental.js |  239 +++-
 .../outFile/noEmitOnError-with-declaration.js |  148 ++-
 .../outFile/noEmitOnError-with-incremental.js |  182 ++-
 .../noEmitOnError/outFile/noEmitOnError.js    |  114 +-
 .../programUpdates/change-module-to-none.js   |   10 +-
 .../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 |  220 ++-
 ...roject-uses-different-module-resolution.js |   26 +
 .../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 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    |  132 +-
 ...noEmit-with-composite-with-emit-builder.js |  170 ++-
 ...it-with-composite-with-semantic-builder.js |  159 ++-
 ...nError-with-composite-with-emit-builder.js |   64 +-
 ...or-with-composite-with-semantic-builder.js |   64 +-
 .../outFile/semantic-builder-emitOnlyDts.js   |   35 +-
 ...createSemanticDiagnosticsBuilderProgram.js |   18 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    |   91 +-
 ...ing-useSourceOfProjectReferenceRedirect.js |  220 ++-
 ...-host-implementing-getParsedCommandLine.js |   81 +-
 ...figMapOptionsAreCaseInsensitive.errors.txt |   21 +
 .../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 |   18 +-
 .../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 |   65 +-
 ...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  |   64 +
 .../when-resolves-to-ambient-module.js        |   64 +
 ...enceDirective-contains-UpperCasePackage.js |   17 +-
 .../local-module-should-not-be-picked-up.js   |    2 +-
 .../reference/tsxAttributeResolution10.js     |   40 +
 .../reference/tsxAttributeResolution9.js      |   32 +
 .../tsxElementResolution17.errors.txt         |   29 +
 .../reference/tsxElementResolution19.js       |  106 ++
 .../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  |   25 +
 ...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 |   55 +
 .../tsxStatelessFunctionComponentOverload5.js |   71 +
 .../tsxStatelessFunctionComponentOverload6.js |   73 +
 ...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 |   21 +
 ...ionComponentsWithTypeArguments5.errors.txt |   23 +
 .../reference/typeAliasDeclarationEmit.js     |    6 +-
 .../typeAliasDeclarationEmit2.errors.txt      |    6 +
 ...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 +
 .../umdDependencyComment2.errors.txt          |    2 +
 .../umdDependencyCommentName1.errors.txt      |    2 +
 .../umdDependencyCommentName2.errors.txt      |    2 +
 .../reference/umdNamedAmdMode.errors.txt      |    7 +
 .../undeclaredModuleError.errors.txt          |    4 +-
 .../reference/undeclaredModuleError.js        |   41 +-
 ...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 +
 .../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         |    8 +
 .../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  |    4 +-
 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 |    8 +
 ...sideLocalModuleWithoutExportAccessError.ts |   10 +
 .../compiler/moduleAugmentationGlobal8.ts     |    2 +-
 .../compiler/moduleAugmentationGlobal8_1.ts   |    2 +-
 tests/cases/compiler/moduleExports1.ts        |    8 +
 ...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 +-
 .../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 +-
 .../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 +-
 ...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 +-
 .../completionsUniqueSymbol_import.ts         |    4 +-
 tests/cases/fourslash/getPreProcessedFile.ts  |    3 +-
 ...oImportCompletionsInOtherJavaScriptFile.ts |    8 +-
 .../fourslash/server/autoImportProvider3.ts   |    4 +-
 .../importSuggestionsCache_exportUndefined.ts |    4 +-
 ...portSuggestionsCache_moduleAugmentation.ts |    2 +-
 1930 files changed, 51591 insertions(+), 8741 deletions(-)
 create mode 100644 tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
 create mode 100644 tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt
 create mode 100644 tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt
 create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
 create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
 create mode 100644 tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt
 create mode 100644 tests/baselines/reference/ambientExternalModuleMerging.errors.txt
 create mode 100644 tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
 create mode 100644 tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
 create mode 100644 tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
 create mode 100644 tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
 create mode 100644 tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
 create mode 100644 tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
 create mode 100644 tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
 create mode 100644 tests/baselines/reference/amdModuleConstEnumUsage.errors.txt
 create mode 100644 tests/baselines/reference/amdModuleName1.errors.txt
 create mode 100644 tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt
 create mode 100644 tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt
 create mode 100644 tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt
 create mode 100644 tests/baselines/reference/augmentExportEquals3_1.errors.txt
 create mode 100644 tests/baselines/reference/augmentExportEquals4_1.errors.txt
 create mode 100644 tests/baselines/reference/augmentExportEquals6_1.errors.txt
 create mode 100644 tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
 create mode 100644 tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt
 create mode 100644 tests/baselines/reference/bangInModuleName.errors.txt
 create mode 100644 tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
 create mode 100644 tests/baselines/reference/cacheResolutions.errors.txt
 create mode 100644 tests/baselines/reference/cachedModuleResolution3.errors.txt
 create mode 100644 tests/baselines/reference/cachedModuleResolution4.errors.txt
 create mode 100644 tests/baselines/reference/capturedLetConstInLoop4.errors.txt
 create mode 100644 tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/classStaticBlock24(module=system).errors.txt
 create mode 100644 tests/baselines/reference/classStaticBlock24(module=umd).errors.txt
 create mode 100644 tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
 create mode 100644 tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
 create mode 100644 tests/baselines/reference/commentsDottedModuleName.errors.txt
 create mode 100644 tests/baselines/reference/commentsExternalModules.errors.txt
 create mode 100644 tests/baselines/reference/commentsExternalModules2.errors.txt
 create mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
 create mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt
 create mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt
 create mode 100644 tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt
 delete mode 100644 tests/baselines/reference/commonSourceDir5.js
 create mode 100644 tests/baselines/reference/commonSourceDir6.errors.txt
 create mode 100644 tests/baselines/reference/constEnumExternalModule.errors.txt
 create mode 100644 tests/baselines/reference/constEnumMergingWithValues1.errors.txt
 create mode 100644 tests/baselines/reference/constEnumMergingWithValues2.errors.txt
 create mode 100644 tests/baselines/reference/constEnumMergingWithValues3.errors.txt
 create mode 100644 tests/baselines/reference/constEnumMergingWithValues4.errors.txt
 create mode 100644 tests/baselines/reference/constEnumMergingWithValues5.errors.txt
 create mode 100644 tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt
 create mode 100644 tests/baselines/reference/declFileExportImportChain.errors.txt
 create mode 100644 tests/baselines/reference/declFileExportImportChain2.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
 create mode 100644 tests/baselines/reference/declarationMapsOutFile.errors.txt
 create mode 100644 tests/baselines/reference/declarationMerging2.errors.txt
 create mode 100644 tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
 create mode 100644 tests/baselines/reference/decoratedClassExportsSystem2.errors.txt
 create mode 100644 tests/baselines/reference/decoratedClassFromExternalModule.errors.txt
 create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
 create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt
 create mode 100644 tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt
 create mode 100644 tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
 create mode 100644 tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
 create mode 100644 tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt
 create mode 100644 tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt
 create mode 100644 tests/baselines/reference/dependencyViaImportAlias.errors.txt
 create mode 100644 tests/baselines/reference/deprecatedCompilerOptions2.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt
 create mode 100644 tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt
 create mode 100644 tests/baselines/reference/dottedNamesInSystem.errors.txt
 create mode 100644 tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
 create mode 100644 tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
 create mode 100644 tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
 create mode 100644 tests/baselines/reference/dynamicRequire.errors.txt
 create mode 100644 tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
 create mode 100644 tests/baselines/reference/emitBundleWithShebang1.errors.txt
 create mode 100644 tests/baselines/reference/emitBundleWithShebang2.errors.txt
 create mode 100644 tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
 create mode 100644 tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt
 delete mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt
 create mode 100644 tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt
 create mode 100644 tests/baselines/reference/es5-amd.errors.txt
 create mode 100644 tests/baselines/reference/es5-declaration-amd.errors.txt
 create mode 100644 tests/baselines/reference/es5-souremap-amd.errors.txt
 create mode 100644 tests/baselines/reference/es5-system.errors.txt
 create mode 100644 tests/baselines/reference/es5-system2.errors.txt
 create mode 100644 tests/baselines/reference/es5-umd.errors.txt
 create mode 100644 tests/baselines/reference/es5-umd2.errors.txt
 create mode 100644 tests/baselines/reference/es5-umd3.errors.txt
 create mode 100644 tests/baselines/reference/es5-umd4.errors.txt
 create mode 100644 tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
 create mode 100644 tests/baselines/reference/es6-amd.errors.txt
 create mode 100644 tests/baselines/reference/es6-declaration-amd.errors.txt
 create mode 100644 tests/baselines/reference/es6-sourcemap-amd.errors.txt
 create mode 100644 tests/baselines/reference/es6-umd.errors.txt
 create mode 100644 tests/baselines/reference/es6-umd2.errors.txt
 create mode 100644 tests/baselines/reference/es6ExportAll.errors.txt
 create mode 100644 tests/baselines/reference/es6ExportAssignment3.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt
 create mode 100644 tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
 create mode 100644 tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
 create mode 100644 tests/baselines/reference/exportAndImport-es5-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/exportAsNamespace4(module=system).errors.txt
 create mode 100644 tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt
 create mode 100644 tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentCircularModules.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentClass.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentError.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentFunction.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentInterface.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentInternalModule.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt
 create mode 100644 tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportEqualCallable.errors.txt
 create mode 100644 tests/baselines/reference/exportEqualNamespaces.errors.txt
 create mode 100644 tests/baselines/reference/exportEqualsAmd.errors.txt
 create mode 100644 tests/baselines/reference/exportEqualsUmd.errors.txt
 create mode 100644 tests/baselines/reference/exportImport.errors.txt
 create mode 100644 tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
 create mode 100644 tests/baselines/reference/exportImportMultipleFiles.errors.txt
 create mode 100644 tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt
 create mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues10.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues2.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues3.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues4.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues5.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues6.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues7.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues8.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValues9.errors.txt
 create mode 100644 tests/baselines/reference/exportStarForValuesInSystem.errors.txt
 create mode 100644 tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
 create mode 100644 tests/baselines/reference/exportedVariable1.errors.txt
 create mode 100644 tests/baselines/reference/exportingContainingVisibleType.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports1-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports2-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports3-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsAndImports4-amd.errors.txt
 create mode 100644 tests/baselines/reference/exportsInAmbientModules1.errors.txt
 create mode 100644 tests/baselines/reference/exportsInAmbientModules2.errors.txt
 create mode 100644 tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
 create mode 100644 tests/baselines/reference/externalModuleAssignToVar.errors.txt
 create mode 100644 tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
 create mode 100644 tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
 create mode 100644 tests/baselines/reference/generatorES6InAMDModule.errors.txt
 create mode 100644 tests/baselines/reference/genericClassesInModule2.errors.txt
 create mode 100644 tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt
 create mode 100644 tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
 create mode 100644 tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES5AMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES5System.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES5UMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES6AMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES6System.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionES6UMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInAMD1.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInAMD2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInAMD3.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInAMD4.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInSystem1.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInSystem2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInSystem3.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInSystem4.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInUMD1.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInUMD2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInUMD3.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInUMD4.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionInUMD5.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedAMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedUMD.errors.txt
 create mode 100644 tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt
 create mode 100644 tests/baselines/reference/importDefaultBindingDefer.errors.txt
 create mode 100644 tests/baselines/reference/importDeferComments.errors.txt
 create mode 100644 tests/baselines/reference/importHelpersAmd.errors.txt
 create mode 100644 tests/baselines/reference/importHelpersES6.errors.txt
 create mode 100644 tests/baselines/reference/importHelpersOutFile.errors.txt
 create mode 100644 tests/baselines/reference/importHelpersSystem.errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt
 create mode 100644 tests/baselines/reference/importImportOnlyModule.errors.txt
 create mode 100644 tests/baselines/reference/importMetaNarrowing(module=system).errors.txt
 create mode 100644 tests/baselines/reference/importShadowsGlobalName.errors.txt
 create mode 100644 tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
 create mode 100644 tests/baselines/reference/import_reference-exported-alias.errors.txt
 create mode 100644 tests/baselines/reference/import_reference-to-type-alias.errors.txt
 create mode 100644 tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt
 create mode 100644 tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt
 create mode 100644 tests/baselines/reference/importedAliasesInTypePositions.errors.txt
 create mode 100644 tests/baselines/reference/importedModuleClassNameClash.errors.txt
 create mode 100644 tests/baselines/reference/importsInAmbientModules1.errors.txt
 create mode 100644 tests/baselines/reference/importsInAmbientModules2.errors.txt
 create mode 100644 tests/baselines/reference/importsInAmbientModules3.errors.txt
 create mode 100644 tests/baselines/reference/instanceOfInExternalModules.errors.txt
 create mode 100644 tests/baselines/reference/interfaceDeclaration5.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
 create mode 100644 tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
 create mode 100644 tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
 create mode 100644 tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt
 create mode 100644 tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt
 create mode 100644 tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
 create mode 100644 tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
 create mode 100644 tests/baselines/reference/keepImportsInDts1.errors.txt
 create mode 100644 tests/baselines/reference/keepImportsInDts2.errors.txt
 create mode 100644 tests/baselines/reference/keepImportsInDts3.errors.txt
 create mode 100644 tests/baselines/reference/keepImportsInDts4.errors.txt
 create mode 100644 tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
 create mode 100644 tests/baselines/reference/libReferenceNoLibBundle.errors.txt
 create mode 100644 tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt
 create mode 100644 tests/baselines/reference/mergedDeclarations6.errors.txt
 create mode 100644 tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationsImports1.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationsImports2.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationsImports3.errors.txt
 create mode 100644 tests/baselines/reference/moduleAugmentationsImports4.errors.txt
 create mode 100644 tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
 create mode 100644 tests/baselines/reference/moduleMergeConstructor.errors.txt
 create mode 100644 tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
 create mode 100644 tests/baselines/reference/moduleNoneOutFile.errors.txt
 create mode 100644 tests/baselines/reference/modulePrologueAMD.errors.txt
 create mode 100644 tests/baselines/reference/modulePrologueSystem.errors.txt
 create mode 100644 tests/baselines/reference/modulePrologueUmd.errors.txt
 create mode 100644 tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
 create mode 100644 tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
 create mode 100644 tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
 create mode 100644 tests/baselines/reference/objectIndexer.errors.txt
 create mode 100644 tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
 create mode 100644 tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
 create mode 100644 tests/baselines/reference/outModuleConcatAmd.errors.txt
 create mode 100644 tests/baselines/reference/outModuleConcatSystem.errors.txt
 create mode 100644 tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
 create mode 100644 tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
 create mode 100644 tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt
 create mode 100644 tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
 create mode 100644 tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt
 create mode 100644 tests/baselines/reference/privacyGetter.errors.txt
 create mode 100644 tests/baselines/reference/privacyGloFunc.errors.txt
 create mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/privatePropertyUsingObjectType.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline/amd/baseline.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline/node/baseline.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline2/node/baseline2.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
 create mode 100644 tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
 create mode 100644 tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt
 create mode 100644 tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt
 create mode 100644 tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt
 create mode 100644 tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
 create mode 100644 tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt
 create mode 100644 tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt
 create mode 100644 tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt
 create mode 100644 tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
 create mode 100644 tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
 create mode 100644 tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
 create mode 100644 tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt
 create mode 100644 tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt
 create mode 100644 tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt
 create mode 100644 tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt
 create mode 100644 tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
 create mode 100644 tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
 create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt
 create mode 100644 tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt
 create mode 100644 tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
 create mode 100644 tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
 create mode 100644 tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
 create mode 100644 tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
 create mode 100644 tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
 create mode 100644 tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt
 create mode 100644 tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt
 create mode 100644 tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
 create mode 100644 tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
 create mode 100644 tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
 create mode 100644 tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
 create mode 100644 tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt
 create mode 100644 tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt
 create mode 100644 tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt
 create mode 100644 tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt
 create mode 100644 tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt
 create mode 100644 tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt
 create mode 100644 tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
 create mode 100644 tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
 create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt
 create mode 100644 tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt
 create mode 100644 tests/baselines/reference/reexportMissingDefault5.errors.txt
 create mode 100644 tests/baselines/reference/relativePathToDeclarationFile.errors.txt
 create mode 100644 tests/baselines/reference/requireEmitSemicolon.errors.txt
 create mode 100644 tests/baselines/reference/scopedPackagesClassic.errors.txt
 create mode 100644 tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt
 create mode 100644 tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt
 create mode 100644 tests/baselines/reference/systemDefaultImportCallable.errors.txt
 create mode 100644 tests/baselines/reference/systemExportAssignment.errors.txt
 create mode 100644 tests/baselines/reference/systemExportAssignment3.errors.txt
 create mode 100644 tests/baselines/reference/systemJsForInNoException.errors.txt
 create mode 100644 tests/baselines/reference/systemModule1.errors.txt
 create mode 100644 tests/baselines/reference/systemModule13.errors.txt
 create mode 100644 tests/baselines/reference/systemModule15.errors.txt
 create mode 100644 tests/baselines/reference/systemModule17.errors.txt
 create mode 100644 tests/baselines/reference/systemModule18.errors.txt
 create mode 100644 tests/baselines/reference/systemModule3.errors.txt
 create mode 100644 tests/baselines/reference/systemModule4.errors.txt
 create mode 100644 tests/baselines/reference/systemModule5.errors.txt
 create mode 100644 tests/baselines/reference/systemModule6.errors.txt
 create mode 100644 tests/baselines/reference/systemModule7.errors.txt
 create mode 100644 tests/baselines/reference/systemModule8.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleConstEnums.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleExportDefault.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleTargetES6.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleTrailingComments.errors.txt
 create mode 100644 tests/baselines/reference/systemModuleWithSuperClass.errors.txt
 create mode 100644 tests/baselines/reference/systemNamespaceAliasEmit.errors.txt
 create mode 100644 tests/baselines/reference/systemObjectShorthandRename.errors.txt
 create mode 100644 tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt
 create mode 100644 tests/baselines/reference/topLevelExports.errors.txt
 create mode 100644 tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Generates module output.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Rename dependencies - System.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Sets module name.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt
 create mode 100644 tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
 create mode 100644 tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
 create mode 100644 tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
 create mode 100644 tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt
 create mode 100644 tests/baselines/reference/tsxElementResolution17.errors.txt
 create mode 100644 tests/baselines/reference/tsxPreserveEmit1.errors.txt
 create mode 100644 tests/baselines/reference/tsxPreserveEmit2.errors.txt
 create mode 100644 tests/baselines/reference/tsxPreserveEmit3.errors.txt
 create mode 100644 tests/baselines/reference/tsxSfcReturnNull.errors.txt
 create mode 100644 tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
 create mode 100644 tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
 create mode 100644 tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt
 create mode 100644 tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
 create mode 100644 tests/baselines/reference/typeResolution.errors.txt
 create mode 100644 tests/baselines/reference/typingsLookupAmd.errors.txt
 create mode 100644 tests/baselines/reference/umdNamedAmdMode.errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt
 create mode 100644 tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt
 create mode 100644 tests/baselines/reference/varArgsOnConstructorTypes.errors.txt
 create mode 100644 tests/baselines/reference/withExportDecl.errors.txt
 create mode 100644 tests/baselines/reference/withImportDecl.errors.txt

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 345eff350521b..f007f0844c1f9 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -607,6 +607,7 @@ export const moduleOptionDeclaration: CommandLineOptionOfCustomType = {
         nodenext: ModuleKind.NodeNext,
         preserve: ModuleKind.Preserve,
     })),
+    deprecatedKeys: new Set(["none", "amd", "system", "umd"]),
     affectsSourceFile: true,
     affectsModuleResolution: true,
     affectsEmit: true,
@@ -1070,13 +1071,13 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
             nodenext: ModuleResolutionKind.NodeNext,
             bundler: ModuleResolutionKind.Bundler,
         })),
-        deprecatedKeys: new Set(["node"]),
+        deprecatedKeys: new Set(["node", "node10", "classic"]),
         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.module_AMD_or_UMD_or_System_or_ES6_then_Classic_Otherwise_Node,
+        defaultValueDescription: Diagnostics.nodenext_if_module_is_nodenext_node16_if_module_is_node16_or_node18_otherwise_bundler,
     },
     {
         name: "baseUrl",
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 22ac200a0dcee..456413cb19bd5 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -6603,7 +6603,7 @@
         "category": "Message",
         "code": 6909
     },
-    "module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node`": {
+    "`nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`.": {
         "category": "Message",
         "code": 69010
     },
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index d4ce786f3d10f..a49c300641a50 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -4528,6 +4528,12 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             if (options.moduleResolution === ModuleResolutionKind.Node10) {
                 createDeprecatedDiagnostic("moduleResolution", "node10");
             }
+            if (options.moduleResolution === ModuleResolutionKind.Classic) {
+                createDeprecatedDiagnostic("moduleResolution", "classic");
+            }
+            if (options.module === ModuleKind.None || options.module === ModuleKind.AMD || options.module === ModuleKind.UMD || options.module === ModuleKind.System) {
+                createDeprecatedDiagnostic("module", ModuleKind[options.module]);
+            }
         });
     }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index a9da465175328..0985426e4202f 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -7331,6 +7331,7 @@ export function diagnosticCategoryName(d: { category: DiagnosticCategory; }, low
 }
 
 export enum ModuleResolutionKind {
+    /** @deprecated */
     Classic = 1,
     /**
      * @deprecated
@@ -7593,10 +7594,14 @@ 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 e1b3cdf7868e2..dad5e78722bbf 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -8985,27 +8985,23 @@ const _computedOptions = createComputedCompilerOptions({
     moduleResolution: {
         dependencies: ["module", "target"],
         computeValue: (compilerOptions): ModuleResolutionKind => {
-            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;
-                }
+            if (compilerOptions.moduleResolution !== undefined) {
+                return compilerOptions.moduleResolution;
             }
-            return 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;
+            }
+            return ModuleResolutionKind.Bundler;
         },
     },
     moduleDetection: {
@@ -9055,7 +9051,7 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     resolvePackageJsonExports: {
-        dependencies: ["moduleResolution"],
+        dependencies: ["moduleResolution", "module", "target"],
         computeValue: (compilerOptions): boolean => {
             const moduleResolution = _computedOptions.moduleResolution.computeValue(compilerOptions);
             if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
@@ -9074,7 +9070,7 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     resolvePackageJsonImports: {
-        dependencies: ["moduleResolution", "resolvePackageJsonExports"],
+        dependencies: ["moduleResolution", "resolvePackageJsonExports", "module", "target"],
         computeValue: (compilerOptions): boolean => {
             const moduleResolution = _computedOptions.moduleResolution.computeValue(compilerOptions);
             if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 950d27c2de238..3c34d0dbfa49a 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -482,7 +482,7 @@ export const enum SymbolOriginInfoKind {
     ComputedPropertyName = 1 << 9,
 
     SymbolMemberNoExport = SymbolMember,
-    SymbolMemberExport   = SymbolMember | Export,
+    SymbolMemberExport   = SymbolMember | ResolvedExport,
 }
 
 /** @internal */
@@ -536,7 +536,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 (originIsExport(origin)) {
-        return stripQuotes(origin.moduleSymbol.name);
-    }
     if (originIsResolvedExport(origin)) {
         return origin.moduleSpecifier;
     }
+    if (originIsExport(origin)) {
+        return stripQuotes(origin.moduleSymbol.name);
+    }
     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 827f57956ea1a..c3e584aa9d32b 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 },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
         );
 
         assert.strictEqual(x, 1);
diff --git a/src/testRunner/unittests/evaluation/updateExpressionInModule.ts b/src/testRunner/unittests/evaluation/updateExpressionInModule.ts
index 2dc7b5188a650..357ca120ba682 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 });
+        }, { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" });
         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 },
+            { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
             { 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 });
+        }, { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" });
         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 },
+            { module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
             { BigInt },
         );
         assert.equal(result.a, BigInt(2));
diff --git a/src/testRunner/unittests/evaluation/usingDeclarations.ts b/src/testRunner/unittests/evaluation/usingDeclarations.ts
index d7c3bd26a47b5..71a9317abf0f2 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 },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.AMD, ignoreDeprecations: "6.0" },
         );
 
         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 },
+            { target: ts.ScriptTarget.ES2018, module: ts.ModuleKind.System, ignoreDeprecations: "6.0" },
         );
 
         assert.strictEqual(x, 1);
diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts
index 30114dc48f8a2..d9cce42321d01 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" } }),
+            content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd", ignoreDeprecations: "6.0" } }),
         };
 
         verifyIncrementalWatchEmit({
@@ -202,6 +202,7 @@ 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);
@@ -228,7 +229,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" } }),
+                content: jsonToReadableText({ compilerOptions: { incremental: true, module: "amd", outFile: "out.js", ignoreDeprecations: "6.0" } }),
             }],
             subScenario: "module compilation/with --out",
         });
diff --git a/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt b/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
new file mode 100644
index 0000000000000..cf1deb71e192a
--- /dev/null
+++ b/tests/baselines/reference/SystemModuleForStatementNoInitializer.errors.txt
@@ -0,0 +1,22 @@
+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 cbd259f770a6a..945f8b05d7681 100644
--- a/tests/baselines/reference/aliasesInSystemModule1.errors.txt
+++ b/tests/baselines/reference/aliasesInSystemModule1.errors.txt
@@ -1,6 +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.
 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 e484e65dd8a43..88f7402dcd31b 100644
--- a/tests/baselines/reference/aliasesInSystemModule2.errors.txt
+++ b/tests/baselines/reference/aliasesInSystemModule2.errors.txt
@@ -1,6 +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.
 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/allowImportingTsExtensions(moduleresolution=classic).errors.txt b/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
index ae5bc45ff3c2e..98e3d340ca637 100644
--- a/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/allowImportingTsExtensions(moduleresolution=classic).errors.txt
@@ -1,6 +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.
 /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
new file mode 100644
index 0000000000000..8bac3b2cb1dd0
--- /dev/null
+++ b/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=false,moduleresolution=classic).errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..8bac3b2cb1dd0
--- /dev/null
+++ b/tests/baselines/reference/allowImportingTypesDtsExtension(allowimportingtsextensions=true,moduleresolution=classic).errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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/allowSyntheticDefaultImports2.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
new file mode 100644
index 0000000000000..7428078159abc
--- /dev/null
+++ b/tests/baselines/reference/allowSyntheticDefaultImports2.errors.txt
@@ -0,0 +1,12 @@
+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 127332623a9e8..3bafc52f87086 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
@@ -1,6 +1,20 @@
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,8): error TS1192: Module '"b"' has no default export.
 
 
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+!!! 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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== a.ts (1 errors) ====
     import Namespace from "./b";
            ~~~~~~~~~
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
new file mode 100644
index 0000000000000..ff40b5a99bd7d
--- /dev/null
+++ b/tests/baselines/reference/allowSyntheticDefaultImports5.errors.txt
@@ -0,0 +1,14 @@
+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 e464ac761f0c3..c506ef7dea8bf 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
@@ -1,6 +1,20 @@
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,8): error TS1259: Module '"b"' can only be default-imported using the 'esModuleInterop' flag
 
 
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+!!! 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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== 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
new file mode 100644
index 0000000000000..427b9a4ecd4ac
--- /dev/null
+++ b/tests/baselines/reference/allowSyntheticDefaultImports7.errors.txt
@@ -0,0 +1,13 @@
+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 bc2bfa369009c..73f1cd2b4faaa 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports7.types
+++ b/tests/baselines/reference/allowSyntheticDefaultImports7.types
@@ -18,6 +18,7 @@ import { default as Foo } from "./b";
 
 Foo.bar();
 >Foo.bar() : any
+>          : ^^^
 >Foo.bar : () => any
 >        : ^^^^^^^^^
 >Foo : typeof Foo
@@ -27,6 +28,7 @@ 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 4b35802264116..8f8fa2cabe2ae 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
@@ -1,6 +1,20 @@
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+!!! 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 '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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== b.d.ts (0 errors) ====
     export function foo();
     
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.errors.txt
index acd76e48f1fae..f8f07f10a8734 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 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(9,22): error TS2307: Cannot find module 'ext' or its corresponding type declarations.
 
 
 ==== ambientExternalModuleInAnotherExternalModule.ts (2 errors) ====
@@ -15,5 +15,5 @@ ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2792: Cannot find
     // Cannot resolve this ext module reference
     import ext = require("ext");
                          ~~~~~
-!!! error TS2792: Cannot find module 'ext'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'ext' or its corresponding type declarations.
     var x = ext;
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
index b83ea5472a24d..b25dc67f398c6 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
@@ -13,10 +13,30 @@ import ext = require("ext");
 var x = ext;
 
 //// [ambientExternalModuleInAnotherExternalModule.js]
+<<<<<<< HEAD
 define(["require", "exports", "ext"], function (require, exports, ext) {
     "use strict";
     class D {
     }
     var x = ext;
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports", "ext"], function (require, exports, ext) {
+    "use strict";
+    var D = /** @class */ (function () {
+        function D() {
+        }
+        return D;
+    }());
+    var x = ext;
+=======
+"use strict";
+var D = /** @class */ (function () {
+    function D() {
+    }
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     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 cfbcf7edfabcc..e32c911b48c11 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbientExternalModule.js
@@ -4,7 +4,5 @@
 export declare module "M" { }
 
 //// [ambientExternalModuleInsideNonAmbientExternalModule.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.errors.txt b/tests/baselines/reference/ambientExternalModuleMerging.errors.txt
new file mode 100644
index 0000000000000..e8ff61bebbf4d
--- /dev/null
+++ b/tests/baselines/reference/ambientExternalModuleMerging.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d7fe786ac226a
--- /dev/null
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7007f99196d25
--- /dev/null
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..894871da4ea76
--- /dev/null
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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 337697296dbe6..ab399bb12801c 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.types
@@ -3,6 +3,7 @@
 === ambientInsideNonAmbientExternalModule.ts ===
 export declare var x;
 >x : any
+>  : ^^^
 
 export declare function f();
 >f : () => any
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
new file mode 100644
index 0000000000000..3e48ae27ac125
--- /dev/null
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
@@ -0,0 +1,24 @@
+error TS5107: Option '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 298d9b7a59a76..a4b3790832021 100644
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
+++ b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.types
@@ -50,6 +50,7 @@ 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 535952ab28c83..f9f56d78b0572 100644
--- a/tests/baselines/reference/amdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/amdDependencyComment2.errors.txt
@@ -1,6 +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.
 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 0efc3677edaae..5493fec22e1f8 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName2.errors.txt
@@ -1,6 +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.
 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 da2433c64e3ce..9dc61a72ac698 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName3.errors.txt
@@ -1,6 +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.
 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 6788d6c3b3286..877e522bbb2a8 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
@@ -1,10 +1,24 @@
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+amdDependencyCommentName4.ts(6,8): error TS2882: Cannot find module or type declarations for side-effect import of 'unaliasedModule1'.
+=======
+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'.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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?
 amdDependencyCommentName4.ts(14,15): error TS2792: Cannot find module 'aliasedModule3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 amdDependencyCommentName4.ts(17,21): error TS2792: Cannot find module 'aliasedModule4'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
+<<<<<<< HEAD
 ==== amdDependencyCommentName4.ts (4 errors) ====
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== amdDependencyCommentName4.ts (6 errors) ====
+=======
+!!! 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) ====
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     ///<amd-dependency path='aliasedModule5' name='n1'/>
     ///<amd-dependency path='unaliasedModule3'/>
     ///<amd-dependency path='aliasedModule6' name='n2'/>
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt b/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
new file mode 100644
index 0000000000000..db2e8f43f2559
--- /dev/null
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..2384ff62cf093
--- /dev/null
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
@@ -0,0 +1,34 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a0f10142a0010
--- /dev/null
+++ b/tests/baselines/reference/amdModuleBundleNoDuplicateDeclarationEmitComments.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..c481c51265ae0
--- /dev/null
+++ b/tests/baselines/reference/amdModuleConstEnumUsage.errors.txt
@@ -0,0 +1,21 @@
+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,
+        B
+    }
+==== /proj/component/file.ts (0 errors) ====
+    import { CharCode } from 'defs/cc';
+    export class User {
+        method(input: number) {
+            if (CharCode.A === input) {}
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/amdModuleName1.errors.txt b/tests/baselines/reference/amdModuleName1.errors.txt
new file mode 100644
index 0000000000000..93c4eee9c3022
--- /dev/null
+++ b/tests/baselines/reference/amdModuleName1.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 90f9378392567..fea86f1230c6e 100644
--- a/tests/baselines/reference/amdModuleName2.errors.txt
+++ b/tests/baselines/reference/amdModuleName2.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..d13e1332035a7
--- /dev/null
+++ b/tests/baselines/reference/anonymousDefaultExportsAmd.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..af3ae9e2beff6
--- /dev/null
+++ b/tests/baselines/reference/anonymousDefaultExportsSystem.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d2f8b0010b34b
--- /dev/null
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 a138dd064e5f2..df94f6114d48d 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -6951,6 +6951,7 @@ declare namespace ts {
         Message = 3,
     }
     enum ModuleResolutionKind {
+        /** @deprecated */
         Classic = 1,
         /**
          * @deprecated
@@ -7153,10 +7154,14 @@ 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 cc359bceb4904..f8d94084906b3 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).errors.txt
@@ -1,8 +1,10 @@
+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=none).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
index cc359bceb4904..137bc8405d91d 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt
@@ -1,8 +1,10 @@
+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=system).errors.txt b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
index cc359bceb4904..3fdb570adabf4 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=system).errors.txt
@@ -1,8 +1,10 @@
+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 cc359bceb4904..325deca6f6eac 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).errors.txt
@@ -1,8 +1,10 @@
+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/asyncAwaitIsolatedModules_es2017.errors.txt b/tests/baselines/reference/asyncAwaitIsolatedModules_es2017.errors.txt
index d31f2dc0c77fc..ce9229b92587b 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 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,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
 
 ==== asyncAwaitIsolatedModules_es2017.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
     
     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 9ee15a6cc8b1b..0470750b09462 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 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,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations.
 
 
 ==== asyncAwaitIsolatedModules_es6.ts (1 errors) ====
     import { MyPromise } from "missing";
                               ~~~~~~~~~
-!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations.
     
     declare var p: Promise<number>;
     declare var mp: MyPromise<number>;
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index eb59685667812..de98bcca2ac68 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -19,19 +19,28 @@ import "./file2";
 let a: x.A; // should not work
 
 //// [file1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var x = 1;
-    return x;
-});
+"use strict";
+var x = 1;
+module.exports = x;
 //// [file2.js]
-define(["require", "exports"], function (require, exports) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//// [file3.js]
+<<<<<<< HEAD
+define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    let a; // should not work
 });
-//// [file3.js]
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    let a; // should not work
+    var a; // should not work
 });
+=======
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./file2");
+var a; // should not work
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals1_1.errors.txt b/tests/baselines/reference/augmentExportEquals1_1.errors.txt
index 2d4719c215c6a..67a0cb5a1c6b0 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.errors.txt
+++ b/tests/baselines/reference/augmentExportEquals1_1.errors.txt
@@ -1,7 +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.
 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 d75f0950b1e37..2243badb43c63 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -18,19 +18,28 @@ import "./file2";
 let a: x.A; // should not work
 
 //// [file1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    function foo() { }
-    return foo;
-});
+"use strict";
+function foo() { }
+module.exports = foo;
 //// [file2.js]
-define(["require", "exports"], function (require, exports) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//// [file3.js]
+<<<<<<< HEAD
+define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    let a; // should not work
 });
-//// [file3.js]
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    let a; // should not work
+    var a; // should not work
 });
+=======
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./file2");
+var a; // should not work
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals2_1.errors.txt b/tests/baselines/reference/augmentExportEquals2_1.errors.txt
index f03369da40d65..bb0f4e78d9ccf 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.errors.txt
+++ b/tests/baselines/reference/augmentExportEquals2_1.errors.txt
@@ -1,7 +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.
 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 674deac07b87e..a917a40c6cbde 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -24,24 +24,104 @@ let a: x.A;
 let b = x.b;
 
 //// [file1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    function foo() { }
-    (function (foo) {
-        foo.v = 1;
-    })(foo || (foo = {}));
-    return foo;
-});
+"use strict";
+function foo() { }
+(function (foo) {
+    foo.v = 1;
+})(foo || (foo = {}));
+module.exports = foo;
 //// [file2.js]
-define(["require", "exports", "./file1"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    x.b = 1;
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var x = require("./file1");
+x.b = 1;
 //// [file3.js]
+<<<<<<< HEAD
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     let a;
     let b = x.b;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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;
+});
+=======
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals3_1.errors.txt b/tests/baselines/reference/augmentExportEquals3_1.errors.txt
new file mode 100644
index 0000000000000..dbcff1cce46e3
--- /dev/null
+++ b/tests/baselines/reference/augmentExportEquals3_1.errors.txt
@@ -0,0 +1,30 @@
+error TS5107: Option '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.types b/tests/baselines/reference/augmentExportEquals3_1.types
index 684978016dd03..0cb8ad7e4c188 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -48,6 +48,7 @@ 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 f4834349cf754..d024f8459bb26 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -24,6 +24,7 @@ let a: x.A;
 let b = x.b;
 
 //// [file1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class foo {
@@ -31,18 +32,121 @@ define(["require", "exports"], function (require, exports) {
     (function (foo) {
         foo.v = 1;
     })(foo || (foo = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var foo = /** @class */ (function () {
+        function foo() {
+        }
+        return foo;
+    }());
+    (function (foo) {
+        foo.v = 1;
+    })(foo || (foo = {}));
+=======
+"use strict";
+var foo = /** @class */ (function () {
+    function foo() {
+    }
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     return foo;
-});
+}());
+(function (foo) {
+    foo.v = 1;
+})(foo || (foo = {}));
+module.exports = foo;
 //// [file2.js]
-define(["require", "exports", "./file1"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    x.b = 1;
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var x = require("./file1");
+x.b = 1;
 //// [file3.js]
+<<<<<<< HEAD
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     let a;
     let b = x.b;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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;
+});
+=======
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals4_1.errors.txt b/tests/baselines/reference/augmentExportEquals4_1.errors.txt
new file mode 100644
index 0000000000000..138b715c5122d
--- /dev/null
+++ b/tests/baselines/reference/augmentExportEquals4_1.errors.txt
@@ -0,0 +1,30 @@
+error TS5107: Option '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.types b/tests/baselines/reference/augmentExportEquals4_1.types
index fddef2aaacf91..564b3a9d55e58 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -48,6 +48,7 @@ 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 9ff2f8001a2f4..48e5ca5714e90 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -81,14 +81,27 @@ let x: Request;
 const y = x.id;
 
 //// [augmentation.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [consumer.js]
+<<<<<<< HEAD
 define(["require", "exports", "./augmentation"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     let x;
     const y = x.id;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports", "./augmentation"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var x;
+    var y = x.id;
+});
+=======
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("./augmentation");
+var x;
+var y = x.id;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 97cc9aff21227..bc4039ca3b15e 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -28,6 +28,7 @@ let b = a.a;
 let c = x.B.b;
 
 //// [file1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class foo {
@@ -40,15 +41,52 @@ define(["require", "exports"], function (require, exports) {
         (function (B) {
         })(B = foo.B || (foo.B = {}));
     })(foo || (foo = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var foo = /** @class */ (function () {
+        function foo() {
+        }
+        return 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 = {}));
+=======
+"use strict";
+var foo = /** @class */ (function () {
+    function foo() {
+    }
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     return 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 = {}));
+module.exports = foo;
 //// [file2.js]
-define(["require", "exports", "./file1"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    x.B.b = 1;
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var x = require("./file1");
+x.B.b = 1;
 //// [file3.js]
+<<<<<<< HEAD
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -56,3 +94,87 @@ define(["require", "exports", "./file1", "./file2"], function (require, exports,
     let b = a.a;
     let c = x.B.b;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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 = a.a;
+    var c = x.B.b;
+});
+=======
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/augmentExportEquals6_1.errors.txt b/tests/baselines/reference/augmentExportEquals6_1.errors.txt
new file mode 100644
index 0000000000000..3afd16d251826
--- /dev/null
+++ b/tests/baselines/reference/augmentExportEquals6_1.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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/augmentedTypesExternalModule1.errors.txt b/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
new file mode 100644
index 0000000000000..ebcf0f2eb2e4a
--- /dev/null
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
@@ -0,0 +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 '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 d9b841ee69892..bda241f80d448 100644
--- a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt
+++ b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=es2017).errors.txt
@@ -24,7 +24,7 @@ autoAccessorDisallowedModifiers.ts(32,1): error TS1275: 'accessor' modifier can
 autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
-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(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations.
 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.
@@ -119,7 +119,7 @@ autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
                             ~~~
-!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'x' or its corresponding type declarations.
     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 d9b841ee69892..bda241f80d448 100644
--- a/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt
+++ b/tests/baselines/reference/autoAccessorDisallowedModifiers(target=esnext).errors.txt
@@ -24,7 +24,7 @@ autoAccessorDisallowedModifiers.ts(32,1): error TS1275: 'accessor' modifier can
 autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
 autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration.
-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(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations.
 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.
@@ -119,7 +119,7 @@ autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can
     ~~~~~~~~
 !!! error TS1275: 'accessor' modifier can only appear on a property declaration.
                             ~~~
-!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'x' or its corresponding type declarations.
     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
new file mode 100644
index 0000000000000..a07b1781038df
--- /dev/null
+++ b/tests/baselines/reference/awaitUsingDeclarationsTopLevelOfModule.1(module=system).errors.txt
@@ -0,0 +1,18 @@
+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 ade3bfb43c0f7..3e8f3872296e5 100644
--- a/tests/baselines/reference/badExternalModuleReference.errors.txt
+++ b/tests/baselines/reference/badExternalModuleReference.errors.txt
@@ -1,10 +1,10 @@
-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,21): error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
 
 
 ==== badExternalModuleReference.ts (1 errors) ====
     import a1 = require("garbage");
                         ~~~~~~~~~
-!!! error TS2792: Cannot find module 'garbage'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'garbage' or its corresponding type declarations.
     export declare var a: {
         test1: a1.connectModule;
         (): a1.connectExport;
diff --git a/tests/baselines/reference/badExternalModuleReference.js b/tests/baselines/reference/badExternalModuleReference.js
index 4f5d7e4cc2d8a..017e5d940fb2c 100644
--- a/tests/baselines/reference/badExternalModuleReference.js
+++ b/tests/baselines/reference/badExternalModuleReference.js
@@ -9,7 +9,5 @@ export declare var a: {
 
 
 //// [badExternalModuleReference.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/bangInModuleName.errors.txt b/tests/baselines/reference/bangInModuleName.errors.txt
new file mode 100644
index 0000000000000..779592b870ea1
--- /dev/null
+++ b/tests/baselines/reference/bangInModuleName.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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 175fd5671a294..f958ba0e0570a 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.errors.txt
@@ -1,12 +1,9 @@
-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 (2 errors) ====
+==== blockScopedFunctionDeclarationInStrictModule.ts (1 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 512bc5d032753..e7c00bb07a24b 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
@@ -9,11 +9,9 @@ if (true) {
 export = foo; // not ok
 
 //// [blockScopedFunctionDeclarationInStrictModule.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    if (true) {
-        function foo() { }
-        foo(); // ok
-    }
-    return foo;
-});
+"use strict";
+if (true) {
+    function foo() { }
+    foo(); // ok
+}
+module.exports = foo;
diff --git a/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt b/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
new file mode 100644
index 0000000000000..fa5f3d7a5cc72
--- /dev/null
+++ b/tests/baselines/reference/blockScopedNamespaceDifferentFile.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 e5529ff6a51f7..e64b0e174c0e6 100644
--- a/tests/baselines/reference/blockScopedNamespaceDifferentFile.types
+++ b/tests/baselines/reference/blockScopedNamespaceDifferentFile.types
@@ -41,6 +41,7 @@ namespace C {
 
         constructor(parameters) {}
 >parameters : any
+>           : ^^^
     }
 }
 
diff --git a/tests/baselines/reference/cacheResolutions.errors.txt b/tests/baselines/reference/cacheResolutions.errors.txt
new file mode 100644
index 0000000000000..99544b47178b5
--- /dev/null
+++ b/tests/baselines/reference/cacheResolutions.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..a215118639b4d
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution3.errors.txt
@@ -0,0 +1,12 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..dbee47cdf6822
--- /dev/null
+++ b/tests/baselines/reference/cachedModuleResolution4.errors.txt
@@ -0,0 +1,13 @@
+error TS5107: Option '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 454954606fd73..c507bb0e52655 100644
--- a/tests/baselines/reference/cachedModuleResolution8.errors.txt
+++ b/tests/baselines/reference/cachedModuleResolution8.errors.txt
@@ -1,7 +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.
 /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 5c56ae758db02..73ac6316facb1 100644
--- a/tests/baselines/reference/cachedModuleResolution9.errors.txt
+++ b/tests/baselines/reference/cachedModuleResolution9.errors.txt
@@ -1,7 +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.
 /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
new file mode 100644
index 0000000000000..8c5a24ed95a1c
--- /dev/null
+++ b/tests/baselines/reference/capturedLetConstInLoop4.errors.txt
@@ -0,0 +1,147 @@
+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 000da5af1d3ea..2eb4d11566f45 100644
--- a/tests/baselines/reference/capturedLetConstInLoop4.types
+++ b/tests/baselines/reference/capturedLetConstInLoop4.types
@@ -26,30 +26,38 @@ 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
@@ -57,8 +65,11 @@ for (let x of []) {
 >function() { return x + v0} : () => any
 >                            : ^^^^^^^^^
 >x + v0 : any
+>       : ^^^
 >x : any
+>  : ^^^
 >v0 : any
+>   : ^^^
 
     (() => x);    
 >(() => x) : () => any
@@ -66,6 +77,7 @@ for (let x of []) {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
+>  : ^^^
 }
 
 for (let x in []) {
@@ -154,10 +166,13 @@ while (1 === 1) {
 
     let x;
 >x : any
+>  : ^^^
 
     var v2 = x;
 >v2 : any
+>   : ^^^
 >x : any
+>  : ^^^
 
     (function() { return x + v2});
 >(function() { return x + v2}) : () => any
@@ -165,8 +180,11 @@ while (1 === 1) {
 >function() { return x + v2} : () => any
 >                            : ^^^^^^^^^
 >x + v2 : any
+>       : ^^^
 >x : any
+>  : ^^^
 >v2 : any
+>   : ^^^
 
     (() => x);
 >(() => x) : () => any
@@ -174,15 +192,19 @@ 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
@@ -190,8 +212,11 @@ do {
 >function() { return x + v3} : () => any
 >                            : ^^^^^^^^^
 >x + v3 : any
+>       : ^^^
 >x : any
+>  : ^^^
 >v3 : any
+>   : ^^^
 
     (() => x);
 >(() => x) : () => any
@@ -199,6 +224,7 @@ do {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
+>  : ^^^
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -322,11 +348,15 @@ 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
@@ -334,10 +364,15 @@ 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
@@ -345,18 +380,25 @@ 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
@@ -364,10 +406,15 @@ 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
@@ -375,8 +422,11 @@ do {
 >() => x + y : () => any
 >            : ^^^^^^^^^
 >x + y : any
+>      : ^^^
 >x : any
+>  : ^^^
 >y : any
+>  : ^^^
 
 } while (1 === 1)
 >1 === 1 : boolean
@@ -468,6 +518,7 @@ export function exportedFoo2() {
 >v0_c + v00_c : string
 >             : ^^^^^^
 >v0_c : any
+>     : ^^^
 >v00_c : string
 >      : ^^^^^^
 >v1_c : number
@@ -490,12 +541,15 @@ 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
@@ -503,8 +557,11 @@ for (const x of []) {
 >function() { return x + v0_c} : () => any
 >                              : ^^^^^^^^^
 >x + v0_c : any
+>         : ^^^
 >x : any
+>  : ^^^
 >v0_c : any
+>     : ^^^
 
     (() => x);    
 >(() => x) : () => any
@@ -512,6 +569,7 @@ for (const x of []) {
 >() => x : () => any
 >        : ^^^^^^^^^
 >x : any
+>  : ^^^
 }
 
 for (const x in []) {
diff --git a/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt b/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
new file mode 100644
index 0000000000000..a775df1810045
--- /dev/null
+++ b/tests/baselines/reference/classStaticBlock24(module=amd).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..6b5f7f745665d
--- /dev/null
+++ b/tests/baselines/reference/classStaticBlock24(module=system).errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..b26e6adcd95cf
--- /dev/null
+++ b/tests/baselines/reference/classStaticBlock24(module=umd).errors.txt
@@ -0,0 +1,12 @@
+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 14abebcb75fcd..8a030e687c10d 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 68c8ae98fb99c..df3f4a3cb36f0 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,31 +18,27 @@ export function foo2() {
 }
 
 //// [collisionExportsRequireAndAlias_file1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.bar = bar;
-    function bar() {
-    }
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar = bar;
+function bar() {
+}
 //// [collisionExportsRequireAndAlias_file3333.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.bar2 = bar2;
-    function bar2() {
-    }
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bar2 = bar2;
+function bar2() {
+}
 //// [collisionExportsRequireAndAlias_file2.js]
-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();
-    }
-});
+"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();
+}
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.symbols b/tests/baselines/reference/collisionExportsRequireAndAlias.symbols
index 8b85320e2c981..471d8d7742dd7 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, 66))
+import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error
+>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68))
 
 export function foo() {
->foo : Symbol(foo, Decl(collisionExportsRequireAndAlias_file2.ts, 1, 69))
+>foo : Symbol(foo, Decl(collisionExportsRequireAndAlias_file2.ts, 1, 71))
 
     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, 66))
+>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68))
 >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 fae7e43435e2d..39d242dc75f75 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 19e18fec62ed9..0643e7fcff7e9 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
@@ -38,13 +38,11 @@ module m4 {
 }
 
 //// [collisionExportsRequireAndAmbientClass_externalmodule.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var m2;
-    (function (m2) {
-    })(m2 || (m2 = {}));
-});
+"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 d34102f1bbd2a..c0014da2956e4 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
@@ -61,13 +61,11 @@ module m4 {
 }
 
 //// [collisionExportsRequireAndAmbientEnum_externalmodule.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var m2;
-    (function (m2) {
-    })(m2 || (m2 = {}));
-});
+"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 37360d82dc51f..92782b07971e2 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
@@ -16,11 +16,9 @@ module m2 {
 }
 
 //// [collisionExportsRequireAndAmbientFunction.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var m2;
-    (function (m2) {
-        var a = 10;
-    })(m2 || (m2 = {}));
-});
+"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 39a1451e2f747..65520e644e4b8 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -95,22 +95,20 @@ module m4 {
 
 
 //// [collisionExportsRequireAndAmbientModule_externalmodule.js]
-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 = {}));
-});
+"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 3599b9f4133ad..cbfed4ad76f2d 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
@@ -27,14 +27,12 @@ module m4 {
 }
 
 //// [collisionExportsRequireAndAmbientVar_externalmodule.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var m2;
-    (function (m2) {
-        var a = 10;
-    })(m2 || (m2 = {}));
-});
+"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 dbe33f7bb0310..669609ee227cd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.errors.txt
@@ -1,7 +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.
 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 37da5848b8d6c..817bf25e7c35b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.errors.txt
@@ -1,7 +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.
 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 a5cf85435ca77..ca7f958bdd66e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.errors.txt
@@ -1,7 +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.
 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 25e9a3c14a18b..345099bd85692 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.errors.txt
@@ -1,7 +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.
 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 module m {
         export class c {
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
index be62e07875db8..4521dc1b535af 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
@@ -1,7 +1,17 @@
+<<<<<<< HEAD
 collisionExportsRequireAndModule_externalmodule.ts(1,15): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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(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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
+!!! 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 module require {
                   ~~~~~~~
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
new file mode 100644
index 0000000000000..b74aa3662bb84
--- /dev/null
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 36c86cb380df8..bf1efc63f8394 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.errors.txt
@@ -1,7 +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.
 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 752db3d4fecc1..4e5cb3b10c562 100644
--- a/tests/baselines/reference/commentOnImportStatement1.errors.txt
+++ b/tests/baselines/reference/commentOnImportStatement1.errors.txt
@@ -1,4 +1,4 @@
-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(3,22): error TS2307: Cannot find module './foo' or its corresponding type declarations.
 
 
 ==== commentOnImportStatement1.ts (1 errors) ====
@@ -6,5 +6,5 @@ commentOnImportStatement1.ts(3,22): error TS2792: Cannot find module './foo'. Di
     
     import foo = require('./foo');
                          ~~~~~~~
-!!! 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 TS2307: Cannot find module './foo' or its corresponding type declarations.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/commentOnImportStatement1.js b/tests/baselines/reference/commentOnImportStatement1.js
index 3ff36c187a46c..93eb14b9a45b2 100644
--- a/tests/baselines/reference/commentOnImportStatement1.js
+++ b/tests/baselines/reference/commentOnImportStatement1.js
@@ -7,8 +7,6 @@ import foo = require('./foo');
 
 
 //// [commentOnImportStatement1.js]
+"use strict";
 /* Copyright */
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt b/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
new file mode 100644
index 0000000000000..39265bd0f71fa
--- /dev/null
+++ b/tests/baselines/reference/commentsBeforeVariableStatement1.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..4893cf17c42f3
--- /dev/null
+++ b/tests/baselines/reference/commentsDottedModuleName.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..1e2d583d84131
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules.errors.txt
@@ -0,0 +1,63 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..859f2c1134ec3
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules2.errors.txt
@@ -0,0 +1,63 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7bba5d1ad20e3
--- /dev/null
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0ab9bcb53b3e2
--- /dev/null
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=auto).errors.txt
@@ -0,0 +1,25 @@
+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 bdb53395ee523..f4ceb70601f1e 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,7 +12,8 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
+>                                                                                                                                                                                                                                                                    : ^^^
 >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
new file mode 100644
index 0000000000000..0ab9bcb53b3e2
--- /dev/null
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=force).errors.txt
@@ -0,0 +1,25 @@
+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 bdb53395ee523..f4ceb70601f1e 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,7 +12,8 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
+>                                                                                                                                                                                                                                                                    : ^^^
 >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
new file mode 100644
index 0000000000000..0ab9bcb53b3e2
--- /dev/null
+++ b/tests/baselines/reference/commentsOnJSXExpressionsArePreserved(jsx=preserve,module=system,moduledetection=legacy).errors.txt
@@ -0,0 +1,25 @@
+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 bdb53395ee523..f4ceb70601f1e 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,7 +12,8 @@ class Component {
 >       : ^^^^^^^^^
 
         return <div>
-><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : error
+><div>            {/* missing */}            {null/* preserved */}            {                // ??? 1            }            { // ??? 2            }            {// ??? 3            }            {                // ??? 4            /* ??? 5 */}        </div> : any
+>                                                                                                                                                                                                                                                                    : ^^^
 >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 b0f02293888ef..b338d2b06acca 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,6 +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.
 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 b0f02293888ef..b338d2b06acca 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,6 +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.
 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 b0f02293888ef..b338d2b06acca 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,6 +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.
 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 14edadd8849fa..df6ef89966412 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,6 +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.
 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 14edadd8849fa..df6ef89966412 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,6 +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.
 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 14edadd8849fa..df6ef89966412 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,6 +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.
 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 c7df0dceaad77..d87ec056015c4 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,6 +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.
 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 c7df0dceaad77..d87ec056015c4 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,6 +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.
 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 c7df0dceaad77..d87ec056015c4 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,6 +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.
 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 f7ee068ce8474..33dc2ec159f5f 100644
--- a/tests/baselines/reference/commonSourceDir5.errors.txt
+++ b/tests/baselines/reference/commonSourceDir5.errors.txt
@@ -1,7 +1,7 @@
-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.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== 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
deleted file mode 100644
index 17e144e76e5d2..0000000000000
--- a/tests/baselines/reference/commonSourceDir5.js
+++ /dev/null
@@ -1,38 +0,0 @@
-//// [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
new file mode 100644
index 0000000000000..fe46c907271ff
--- /dev/null
+++ b/tests/baselines/reference/commonSourceDir6.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 69a03af11011b..55a526b03dce5 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: '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'.
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 d4a79bbd281e8..d9f02017608e8 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: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
+error TS6046: Argument for '--moduleResolution' option must be: '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 469feff50a44e..95145439db753 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: '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'.
 
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 319a40dc19c17..f2c89c02144f3 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: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'es2022', 'esnext', 'node16', 'node18', 'node20', 'nodenext', 'preserve'.
+tsconfig.json:3:15 - error TS6046: Argument for '--module' option must be: 'commonjs', '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 3ca29cf41cf23..9a1269d4e9957 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: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
+error TS6046: Argument for '--moduleResolution' option must be: '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 e180d422e0f3e..b947f732dd46c 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: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.
+tsconfig.json:3:25 - error TS6046: Argument for '--moduleResolution' option must be: 'node16', 'nodenext', 'bundler'.
 
 3     "moduleResolution": "",
                           ~~
diff --git a/tests/baselines/reference/constDeclarations-access5.errors.txt b/tests/baselines/reference/constDeclarations-access5.errors.txt
index d1751cdb12dd3..b4cdcc1481ac3 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 9f56b8c37eb28..4e5ca86aadede 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,44 +47,42 @@ m.x.toString();
 
 
 //// [constDeclarations_access_1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.x = void 0;
-    exports.x = 0;
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.x = void 0;
+exports.x = 0;
 //// [constDeclarations_access_2.js]
-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();
-});
+"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();
diff --git a/tests/baselines/reference/constDeclarations-access5.symbols b/tests/baselines/reference/constDeclarations-access5.symbols
index 65623de9f6023..59d9f3ed8cb7a 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 54ad90a7a7f49..bbc39860b8a02 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
new file mode 100644
index 0000000000000..d08f6cfde81f6
--- /dev/null
+++ b/tests/baselines/reference/constEnumExternalModule.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..89a9781a77439
--- /dev/null
+++ b/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..41c37c230e61a
--- /dev/null
+++ b/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..392e81fe5db77
--- /dev/null
+++ b/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e46dea07f4330
--- /dev/null
+++ b/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..2fa0a85fe0dbd
--- /dev/null
+++ b/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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/contextuallyTypedStringLiteralsInJsxAttributes02.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
index 9478a6c870ffc..411849dd0244f 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
@@ -40,6 +40,7 @@ const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" |
 
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -52,7 +53,33 @@ define(["require", "exports", "react"], function (require, exports, React) {
             return this._buildMainLink(props);
         }
         return this._buildMainButton(props);
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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);
+=======
+"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);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
+<<<<<<< HEAD
     const b0 = <MainButton {...{ onClick: (k) => { console.log(k); } }} extra/>; // k has type "left" | "right"
     const b2 = <MainButton onClick={(k) => { console.log(k); }} extra/>; // k has type "left" | "right"
     const b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
@@ -62,3 +89,25 @@ define(["require", "exports", "react"], function (require, exports, React) {
     function NoOverload1(linkProps) { return undefined; }
     const d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    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"
+});
+=======
+    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"
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/copyrightWithNewLine1.errors.txt b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
index 1f1e7b1fb1c73..c091aec88b66d 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithNewLine1.errors.txt
@@ -1,4 +1,4 @@
-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(5,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations.
 
 
 ==== copyrightWithNewLine1.ts (1 errors) ====
@@ -8,7 +8,7 @@ copyrightWithNewLine1.ts(5,24): error TS2792: Cannot find module './greeter'. Di
     
     import model = require("./greeter")
                            ~~~~~~~~~~~
-!!! error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations.
     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 0681fec54f7cd..a3c8ab6817a86 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -12,14 +12,13 @@ var greeter = new model.Greeter(el);
 greeter.start();
 
 //// [copyrightWithNewLine1.js]
+"use strict";
 /*****************************
 * (c) Copyright - Important
 ****************************/
-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();
-});
+Object.defineProperty(exports, "__esModule", { value: true });
+var model = require("./greeter");
+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 792459828a902..cc9d2adb142ed 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.errors.txt
@@ -1,4 +1,4 @@
-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(4,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations.
 
 
 ==== copyrightWithoutNewLine1.ts (1 errors) ====
@@ -7,7 +7,7 @@ copyrightWithoutNewLine1.ts(4,24): error TS2792: Cannot find module './greeter'.
     ****************************/
     import model = require("./greeter")
                            ~~~~~~~~~~~
-!!! error TS2792: Cannot find module './greeter'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations.
     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 c7c6e137a6e95..f4cc84e33551e 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,11 +11,13 @@ var greeter = new model.Greeter(el);
 greeter.start();
 
 //// [copyrightWithoutNewLine1.js]
-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();
-});
+"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();
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 6f0240135135e..edaf467e6940d 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,6 +15,7 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 
 
 //// [crashIntypeCheckInvocationExpression.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -27,4 +28,26 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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);
+    });
+=======
+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);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
index b1c070056b052..499536fc2566f 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..1db94ea8bda4c
--- /dev/null
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ada1a14a394ee
--- /dev/null
+++ b/tests/baselines/reference/declFileExportImportChain.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f9049968335b9
--- /dev/null
+++ b/tests/baselines/reference/declFileExportImportChain2.errors.txt
@@ -0,0 +1,23 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f5d93de80e5ea
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitAmdModuleDefault.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..b6433574483c9
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitAmdModuleNameDirective.errors.txt
@@ -0,0 +1,11 @@
+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/declarationEmitBundleWithAmbientReferences.errors.txt b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
new file mode 100644
index 0000000000000..50a797b87f127
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitBundleWithAmbientReferences.errors.txt
@@ -0,0 +1,23 @@
+error TS5107: Option '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/declarationEmitDefaultExportWithTempVarName.errors.txt b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
new file mode 100644
index 0000000000000..6e43f0a6d1213
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarName.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..6e43f0a6d1213
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitDefaultExportWithTempVarNameWithBundling.errors.txt
@@ -0,0 +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.
+
+
+!!! 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/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
new file mode 100644
index 0000000000000..61dd1f4f22343
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.errors.txt
@@ -0,0 +1,26 @@
+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;
+    	value: number;
+    }
+    
+    export function scalar(value: string): Scalar {
+    	return null as any;
+    }
+==== src/settings/spacing.ts (0 errors) ====
+    import { scalar } from '../lib/operators/scalar';
+    
+    export default {
+    	get xs() {
+    		return scalar("14px");
+    	}
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationMapsOutFile.errors.txt b/tests/baselines/reference/declarationMapsOutFile.errors.txt
new file mode 100644
index 0000000000000..8732b01aa92ca
--- /dev/null
+++ b/tests/baselines/reference/declarationMapsOutFile.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e7d98bca5e94b
--- /dev/null
+++ b/tests/baselines/reference/declarationMerging2.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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/decoratedClassExportsSystem1.errors.txt b/tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
new file mode 100644
index 0000000000000..eb58f2d11abb0
--- /dev/null
+++ b/tests/baselines/reference/decoratedClassExportsSystem1.errors.txt
@@ -0,0 +1,12 @@
+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 26ab62feeecf0..b58772b93a374 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem1.types
+++ b/tests/baselines/reference/decoratedClassExportsSystem1.types
@@ -5,13 +5,17 @@ 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
new file mode 100644
index 0000000000000..5941fbc37f44f
--- /dev/null
+++ b/tests/baselines/reference/decoratedClassExportsSystem2.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 3da3d09187ff4..b8f242fc8fa87 100644
--- a/tests/baselines/reference/decoratedClassExportsSystem2.types
+++ b/tests/baselines/reference/decoratedClassExportsSystem2.types
@@ -5,13 +5,17 @@ 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
new file mode 100644
index 0000000000000..a12f24078e41e
--- /dev/null
+++ b/tests/baselines/reference/decoratedClassFromExternalModule.errors.txt
@@ -0,0 +1,13 @@
+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 49b9730a3ea7f..5b4c4a914f0e5 100644
--- a/tests/baselines/reference/decoratedClassFromExternalModule.types
+++ b/tests/baselines/reference/decoratedClassFromExternalModule.types
@@ -5,6 +5,7 @@ function decorate(target: any) { }
 >decorate : (target: any) => void
 >         : ^      ^^   ^^^^^^^^^
 >target : any
+>       : ^^^
 
 @decorate
 >decorate : (target: any) => void
@@ -16,6 +17,6 @@ export default class Decorated { }
 
 === undecorated.ts ===
 import Decorated from 'decorated';
->Decorated : typeof Decorated
->          : ^^^^^^^^^^^^^^^^
+>Decorated : any
+>          : ^^^
 
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
new file mode 100644
index 0000000000000..b64a7fd4844e6
--- /dev/null
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..28709a2ceab5d
--- /dev/null
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedSystem.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c27488d906117
--- /dev/null
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.errors.txt
@@ -0,0 +1,16 @@
+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/deduplicateImportsInSystem.errors.txt b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
index 1436db7ab264b..7b2b25dcce818 100644
--- a/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
+++ b/tests/baselines/reference/deduplicateImportsInSystem.errors.txt
@@ -1,3 +1,4 @@
+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?
@@ -6,6 +7,7 @@ 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/defaultExportInAwaitExpression01.errors.txt b/tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
new file mode 100644
index 0000000000000..c732d5e0374d7
--- /dev/null
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.errors.txt
@@ -0,0 +1,15 @@
+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/defaultExportsGetExportedAmd.errors.txt b/tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
new file mode 100644
index 0000000000000..732344d6d0767
--- /dev/null
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ef493e8916dc0
--- /dev/null
+++ b/tests/baselines/reference/defaultExportsGetExportedSystem.errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..de3992a2ab2c9
--- /dev/null
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..844e280bc7f53
--- /dev/null
+++ b/tests/baselines/reference/dependencyViaImportAlias.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..4e16fb63f207d
--- /dev/null
+++ b/tests/baselines/reference/deprecatedCompilerOptions2.errors.txt
@@ -0,0 +1,24 @@
+/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 1d97da4493ad2..401c87dd813f0 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
+++ b/tests/baselines/reference/deprecatedCompilerOptions6.errors.txt
@@ -1,3 +1,4 @@
+/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.
@@ -10,10 +11,12 @@
 /foo/tsconfig.json(12,31): error TS5103: Invalid value for '--ignoreDeprecations'.
 
 
-==== /foo/tsconfig.json (9 errors) ====
+==== /foo/tsconfig.json (10 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
new file mode 100644
index 0000000000000..f96056623b6ac
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3604304be0b31
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7de7f1e7395cf
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..2027d59a689c4
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..81fbe072046eb
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations7.errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..6065428600add
--- /dev/null
+++ b/tests/baselines/reference/destructuringInVariableDeclarations8.errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..c2edb41183fd0
--- /dev/null
+++ b/tests/baselines/reference/dottedNamesInSystem.errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..b77245686dbd9
--- /dev/null
+++ b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 8214b887d34e2..c8fa040349c5d 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,6 +38,7 @@ export var tests: TestRunner = (function () {
 })();
 
 //// [duplicateLocalVariable2.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -47,7 +48,48 @@ define(["require", "exports"], function (require, exports) {
             this.name = name;
             this.test = test;
             this.errorMessageRegEx = errorMessageRegEx;
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+=======
+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]);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         }
+<<<<<<< HEAD
     }
     exports.TestCase = TestCase;
     class TestRunner {
@@ -78,3 +120,50 @@ define(["require", "exports"], function (require, exports) {
         return testRunner;
     })();
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        return TestCase;
+    }());
+    exports.TestCase = TestCase;
+    var TestRunner = /** @class */ (function () {
+        function 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;
+    })();
+});
+=======
+        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;
+})();
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 5047ddc9af126..b601c1013b641 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,6 +68,7 @@ interface D { }
 export interface D { }
 
 //// [duplicateSymbolsExportMatching.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -104,3 +105,82 @@ define(["require", "exports"], function (require, exports) {
         })(C = M.C || (M.C = {}));
     })(M || (M = {}));
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 = {}));
+});
+=======
+"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 = {}));
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
new file mode 100644
index 0000000000000..485d3a55c6717
--- /dev/null
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.errors.txt
@@ -0,0 +1,16 @@
+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_es5.errors.txt b/tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
new file mode 100644
index 0000000000000..dc99f48efb5e0
--- /dev/null
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es5.errors.txt
@@ -0,0 +1,16 @@
+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/dynamicRequire.errors.txt b/tests/baselines/reference/dynamicRequire.errors.txt
new file mode 100644
index 0000000000000..7fb9861b1c809
--- /dev/null
+++ b/tests/baselines/reference/dynamicRequire.errors.txt
@@ -0,0 +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 '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 fb62d1b5bf8a1..9e4308870ea39 100644
--- a/tests/baselines/reference/dynamicRequire.types
+++ b/tests/baselines/reference/dynamicRequire.types
@@ -5,15 +5,20 @@ 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
new file mode 100644
index 0000000000000..be3f26e9f4f17
--- /dev/null
+++ b/tests/baselines/reference/emitBundleWithPrologueDirectives1.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..021ac05175bd5
--- /dev/null
+++ b/tests/baselines/reference/emitBundleWithShebang1.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..a03d46fc493a9
--- /dev/null
+++ b/tests/baselines/reference/emitBundleWithShebang2.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..1664ccbe0bf8a
--- /dev/null
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives1.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..5aa3055ef8c13
--- /dev/null
+++ b/tests/baselines/reference/emitBundleWithShebangAndPrologueDirectives2.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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/emitHelpersWithLocalCollisions(module=amd).errors.txt b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
new file mode 100644
index 0000000000000..4e61d07e8b4ba
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=amd).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
deleted file mode 100644
index 67291b1f976cd..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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 47204b7a76f30..2bf5641f43b50 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node16).js
@@ -10,17 +10,20 @@ 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 {
 };
-A = __decorate([
+exports.A = A;
+exports.A = 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
deleted file mode 100644
index 7dfd532d52b18..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-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 47204b7a76f30..2bf5641f43b50 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node18).js
@@ -10,17 +10,20 @@ 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 {
 };
-A = __decorate([
+exports.A = A;
+exports.A = 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
deleted file mode 100644
index 07470d26af612..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-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 47204b7a76f30..2bf5641f43b50 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=node20).js
@@ -10,17 +10,20 @@ 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 {
 };
-A = __decorate([
+exports.A = A;
+exports.A = 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
deleted file mode 100644
index 3537cb1753855..0000000000000
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-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 47204b7a76f30..2bf5641f43b50 100644
--- a/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=nodenext).js
@@ -10,17 +10,20 @@ 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 {
 };
-A = __decorate([
+exports.A = A;
+exports.A = 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
new file mode 100644
index 0000000000000..a834448c84956
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=none).errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..52bbe25be4955
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=system).errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..ca96dc816818a
--- /dev/null
+++ b/tests/baselines/reference/emitHelpersWithLocalCollisions(module=umd).errors.txt
@@ -0,0 +1,12 @@
+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/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt b/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
index 48c2dfaf4dba8..2aaff41831d1c 100644
--- a/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
+++ b/tests/baselines/reference/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt
@@ -1,4 +1,4 @@
-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(3,23): error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations.
 
 
 ==== errorForBareSpecifierWithImplicitModuleResolutionNone.ts (1 errors) ====
@@ -6,6 +6,6 @@ errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2792: Ca
     
     import { thing } from "non-existent-module";
                           ~~~~~~~~~~~~~~~~~~~~~
-!!! 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?
+!!! error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations.
     thing()
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5-amd.errors.txt b/tests/baselines/reference/es5-amd.errors.txt
new file mode 100644
index 0000000000000..894e40177a85b
--- /dev/null
+++ b/tests/baselines/reference/es5-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3fe9c569c8803
--- /dev/null
+++ b/tests/baselines/reference/es5-declaration-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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 f3e4a9a3f0dd5..14326db556653 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() {
 }
 
-//// [tslib.d.ts]
+//// [index.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 c0f483062139e..5781f210fb6c1 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))
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
->__extends : Symbol(__extends, Decl(tslib.d.ts, --, --))
->d : Symbol(d, Decl(tslib.d.ts, --, --))
+>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
+>d : Symbol(d, Decl(index.d.ts, 0, 34))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->b : Symbol(b, Decl(tslib.d.ts, --, --))
+>b : Symbol(b, Decl(index.d.ts, 0, 46))
 >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(tslib.d.ts, --, --))
->t : Symbol(t, Decl(tslib.d.ts, --, --))
->sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+>__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))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
->__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --))
->decorators : Symbol(decorators, Decl(tslib.d.ts, --, --))
+>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
+>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->target : Symbol(target, Decl(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.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))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
->__param : Symbol(__param, Decl(tslib.d.ts, --, --))
->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --))
->decorator : Symbol(decorator, Decl(tslib.d.ts, --, --))
+>__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))
 >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(tslib.d.ts, --, --))
->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --))
->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --))
+>__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))
 >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(tslib.d.ts, --, --))
->thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
->_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
->P : Symbol(P, Decl(tslib.d.ts, --, --))
+>__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))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
->generator : Symbol(generator, Decl(tslib.d.ts, --, --))
+>generator : Symbol(generator, Decl(index.d.ts, 5, 77))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __generator(body: Function): any;
->__generator : Symbol(__generator, Decl(tslib.d.ts, --, --))
->body : Symbol(body, Decl(tslib.d.ts, --, --))
+>__generator : Symbol(__generator, Decl(index.d.ts, 5, 104))
+>body : Symbol(body, Decl(index.d.ts, 6, 36))
 >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 f582f971bbb83..6a5b209059eb6 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.types
@@ -12,7 +12,7 @@ async function foo() {
 >    : ^^^^^^^^^^^^^^^^^^^
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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
new file mode 100644
index 0000000000000..93608b3b5a9e3
--- /dev/null
+++ b/tests/baselines/reference/es5-souremap-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..06a0b65c67577
--- /dev/null
+++ b/tests/baselines/reference/es5-system.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..83ae01c4962f9
--- /dev/null
+++ b/tests/baselines/reference/es5-system2.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..be610e68b84f1
--- /dev/null
+++ b/tests/baselines/reference/es5-umd.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..e4bde504f3a15
--- /dev/null
+++ b/tests/baselines/reference/es5-umd2.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..ce88775497f94
--- /dev/null
+++ b/tests/baselines/reference/es5-umd3.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..2f87d8562faf1
--- /dev/null
+++ b/tests/baselines/reference/es5-umd4.errors.txt
@@ -0,0 +1,20 @@
+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 f5cd3e7810753..8b3f425d725bb 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 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(34,16): error TS2307: Cannot find module 'M3' or its corresponding type declarations.
 
 
 ==== es5ModuleInternalNamedImports.ts (12 errors) ====
@@ -70,5 +70,5 @@ es5ModuleInternalNamedImports.ts(34,16): error TS2792: Cannot find module 'M3'.
     }
     import M3 from "M3";
                    ~~~~
-!!! error TS2792: Cannot find module 'M3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'M3' or its corresponding type declarations.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 8219dc38e8a31..2965406e35bcb 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -38,6 +38,7 @@ import M3 from "M3";
 
 
 //// [es5ModuleInternalNamedImports.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -66,3 +67,66 @@ define(["require", "exports"], function (require, exports) {
         M.M_A = M_M;
     })(M || (exports.M = M = {}));
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 = {}));
+});
+=======
+"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 = {}));
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt b/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
new file mode 100644
index 0000000000000..3e6978b3c6df0
--- /dev/null
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..833994836117f
--- /dev/null
+++ b/tests/baselines/reference/es6-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3692c46db4068
--- /dev/null
+++ b/tests/baselines/reference/es6-declaration-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..92d35757e0569
--- /dev/null
+++ b/tests/baselines/reference/es6-sourcemap-amd.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a05e673c52789
--- /dev/null
+++ b/tests/baselines/reference/es6-umd.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..ce0182d579719
--- /dev/null
+++ b/tests/baselines/reference/es6-umd2.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..b4a0ac07bb257
--- /dev/null
+++ b/tests/baselines/reference/es6ExportAll.errors.txt
@@ -0,0 +1,19 @@
+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 8edce04a105c1..4a7c3f7332955 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 3278af118c0c9..85867d23e25fa 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 6fa64f1a1e93e..ea19d84a18277 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 f1549da945959..a7e3d69ea097a 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
new file mode 100644
index 0000000000000..9ae1143e42d99
--- /dev/null
+++ b/tests/baselines/reference/es6ExportAssignment3.errors.txt
@@ -0,0 +1,12 @@
+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 f22df17b39120..8ce50d2cd7a78 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 : number
->  : ^^^^^^
+>a : any
+>  : ^^^
 
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
index f9bd8f844847e..524e29843d3e3 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
@@ -13,11 +13,11 @@ export module 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 4ba4b8aea4387..9edf7a3487ac0 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.symbols
@@ -21,21 +21,21 @@ export module 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 8f0f979af27dd..0fa4f794764df 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.types
@@ -27,17 +27,17 @@ export module 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/es6ImportDefaultBinding.js b/tests/baselines/reference/es6ImportDefaultBinding.js
index bdc9b4b846317..4dc135ea4813b 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 a5b73019ad37d..1b8360a6dda7a 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 7259ff29b1dba..d93a534da3580 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
new file mode 100644
index 0000000000000..9ccf2ad6667b6
--- /dev/null
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt
index b097a3089c190..a581c4deaca0e 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 31194c308ba6b..985f695b6c058 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 efe22435de905..db2926e1025e1 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 cc848577ff58d..593b3904a3943 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/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt
index 6e6ad7a586eac..08261f24e767f 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 e2bd0c2d125ac..dd9775e4ddef3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -7,42 +7,43 @@ 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]
-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 = {};
-});
+"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]
-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;
-});
+"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;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols
index 3fc028cb7a670..35bbfb8c42413 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 69f14f12e1599..cfac0a86f6d93 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 2a8a666ba905b..446b5e271d756 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 2c86e06263511..e38fa303c6bfe 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 f6c055019ee63..f2686bc37c962 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 37df16e07fe3b..ee79a876e577a 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 039b4a3dce8a5..bd12489fc9d52 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 b8cac73d9a6f4..700ee31c46dea 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 e96874529a3eb..e41841cb0900f 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/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
index c4e493e1c80c8..2c71ce2555eb4 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.errors.txt
@@ -1,12 +1,14 @@
+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 8bed6e890bfe1..1879e3fa62b7e 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,7 +16,19 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
+<<<<<<< HEAD
 define(["require", "exports", "server"], function (require, exports, server_1) {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+define(["require", "exports", "server"], function (require, exports, server_1) {
+=======
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+define(["require", "exports", "./server"], function (require, exports, server_1) {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.symbols
index b8ed20c120288..42acdc7dd56b0 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 5cc82390e35da..580e9301d1434 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/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
new file mode 100644
index 0000000000000..273d72455a1ac
--- /dev/null
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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 ff72f3f560513..4bd9fdd870ba6 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]
@@ -17,7 +17,19 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
+<<<<<<< HEAD
 define(["require", "exports", "server"], function (require, exports, server_1) {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+define(["require", "exports", "server"], function (require, exports, server_1) {
+=======
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+define(["require", "exports", "./server"], function (require, exports, server_1) {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
@@ -30,5 +42,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 d4830a8bb4814..6227c06b0ee62 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 14af14a2ff542..0a5070ab4ec70 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/es6ImportDefaultBindingWithExport.errors.txt b/tests/baselines/reference/es6ImportDefaultBindingWithExport.errors.txt
index 467c76ca83a13..de33de8cdad2c 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 b50f0622b125d..c271799f38ebe 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -5,24 +5,44 @@ 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]
-define(["require", "exports"], function (require, exports) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var a = 10;
+exports.default = a;
+//// [client.js]
+<<<<<<< HEAD
+define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var a = 10;
-    exports.default = a;
+    exports.x = void 0;
+    exports.x = server_1.default;
 });
-//// [client.js]
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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;
 });
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols b/tests/baselines/reference/es6ImportDefaultBindingWithExport.symbols
index 1801c44853d97..6090e8d56e169 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 10f078e6b451b..5d4a3cab7045c 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 ee2508c95b4d1..fec1b354af493 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 506c22a351e93..b994bd728a7db 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 ad1c83d5aae0a..fc301a740c4cc 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 8a66b5d3097aa..cee3906a8961b 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/es6ImportNameSpaceImportAmd.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
new file mode 100644
index 0000000000000..7b0a5f46c0724
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.errors.txt
@@ -0,0 +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.
+
+
+!!! 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/es6ImportNameSpaceImportWithExport.errors.txt b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
index 48bef0dde35ea..fabe4072ec1b0 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.errors.txt
@@ -1,7 +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.
 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/es6ImportNamedImportAmd.errors.txt b/tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
new file mode 100644
index 0000000000000..dd45c162b6406
--- /dev/null
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.errors.txt
@@ -0,0 +1,43 @@
+error TS5107: Option '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 e8c9ac41c4ad4..9d62c047bc46c 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 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(1,23): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
 es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS2300: Duplicate identifier 'default'.
-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(2,25): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
 es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS2300: Duplicate identifier 'default'.
-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(3,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
 es6ImportNamedImportIdentifiersParsing.ts(4,21): error TS2300: Duplicate identifier 'yield'.
-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(4,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
 es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS1003: Identifier expected.
 es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS2300: Duplicate identifier 'default'.
-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(5,36): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
 
 
 ==== es6ImportNamedImportIdentifiersParsing.ts (13 errors) ====
@@ -18,30 +18,30 @@ es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2792: Cannot find modul
              ~~~~~
 !!! error TS2300: Duplicate identifier 'yield'.
                           ~~~~~~~~~~~~
-!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
     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 TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
     import { yield as default } from "somemodule"; // error to use default as binding name
                       ~~~~~~~
 !!! error TS1003: Identifier expected.
                       ~~~~~~~
 !!! error TS2300: Duplicate identifier 'default'.
                                      ~~~~~~~~~~~~
-!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
     import { default as yield } from "somemodule"; // no error 
                         ~~~~~
 !!! error TS2300: Duplicate identifier 'yield'.
                                      ~~~~~~~~~~~~
-!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
     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 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
+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations.
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt b/tests/baselines/reference/es6ImportNamedImportParsingError.errors.txt
index 520bcea042994..330a18d8df4d7 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 76f14f91ff2b3..733e5c2d1446d 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 107241ff45244..e721430df5cef 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 dcd8838559d76..95d9d0b14d3e8 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
new file mode 100644
index 0000000000000..a6ae72d663c4b
--- /dev/null
+++ b/tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..62a89df938e50
--- /dev/null
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..114a6e0d44a14
--- /dev/null
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..daf9bb741924e
--- /dev/null
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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 b186d3622092f..8b45346535972 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 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(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
 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 TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     
     namespace N {
diff --git a/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt b/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
index eb4cb6d4feda0..7753787618825 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
+++ b/tests/baselines/reference/es6modulekindWithES5Target9.errors.txt
@@ -1,22 +1,22 @@
-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(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 (5 errors) ====
     import d from "mod";
                   ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     import {a} from "mod";
                     ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     import * as M from "mod";
                        ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     export {a};
     
@@ -26,11 +26,11 @@ es6modulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'. D
     
     export * from "mod";
                   ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     export {b} from "mod"
                     ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     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 4e02a0aa1f994..da6d8195b1e06 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt
@@ -1,7 +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,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 22a986b9e5a3f..657dc265c2631 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt
@@ -1,8 +1,10 @@
+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 34f05ae11fab0..604b8d5ef42f5 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt
@@ -1,8 +1,10 @@
+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 ff8f45539b4d6..7f097b90519d4 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt
@@ -1,8 +1,10 @@
+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 b47515bd36ec2..ded49d9dbb2d6 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt
@@ -1,7 +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(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 af0c5e359fa6a..159602037907b 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt
@@ -1,8 +1,10 @@
+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 8b14940e4d002..1e4931d2da24d 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt
@@ -1,8 +1,10 @@
+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 4cb66dd237a97..1ee336acfa1ae 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt
@@ -1,8 +1,10 @@
+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 b898766dbb070..38dc9bc586074 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt
@@ -1,8 +1,10 @@
+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 d08a1c6ef44be..763a76014c14e 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt
@@ -1,8 +1,10 @@
+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 489843175f354..24fbc1625dd91 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt
@@ -1,8 +1,10 @@
+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 a1fbd5c590608..e35e3c3b1106e 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt
@@ -1,8 +1,10 @@
+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 2b1d68632ddf9..b77962ffe3e9a 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt
@@ -1,8 +1,10 @@
+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 3cb1ee85a8a9f..def48e013e92f 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt
@@ -1,8 +1,10 @@
+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 870c3f04cae09..cdc9d8b50e5c9 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt
@@ -1,7 +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(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 5cea45d643ee6..17da55b9cb616 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt
@@ -1,8 +1,10 @@
+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 13f357800ef76..aee17b86ec519 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt
@@ -1,8 +1,10 @@
+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 c6dd8dec742ef..f56990d1a61da 100644
--- a/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt
+++ b/tests/baselines/reference/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt
@@ -1,8 +1,10 @@
+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 f7da9e69d2a1b..4174a28ed1865 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt
@@ -1,8 +1,10 @@
+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 158223d45b0c8..36b4326789a61 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt
@@ -1,8 +1,10 @@
+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 6edc9212fbd14..5e0780d3a7ac9 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt
@@ -1,8 +1,10 @@
+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 f510e6aea6006..f3d883d83eb61 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt
@@ -1,8 +1,10 @@
+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 ebde494ee6eb1..aef7415378c72 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt
@@ -1,8 +1,10 @@
+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 29120dafafd8b..c4ba413982997 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt
@@ -1,9 +1,11 @@
+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 d964b2c8c093c..3d0af4507d5b0 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt
@@ -1,8 +1,10 @@
+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 ee9cd74f912e2..2ffb54ed36493 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt
@@ -1,9 +1,11 @@
+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 f510b08fac8a5..c43881c25729c 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt
@@ -1,8 +1,10 @@
+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 d5166e4ac5081..ad47215331f2a 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt
@@ -1,7 +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(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 32e3c26fce6c4..b5d3930d6cc43 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt
@@ -1,8 +1,10 @@
+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 512e41daf1ef5..656b9cb545ddf 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt
@@ -1,8 +1,10 @@
+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 cae8fa9adaf4e..55bdbeefbf202 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt
@@ -1,8 +1,10 @@
+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 51303bf08520a..b01d2ed809d18 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt
@@ -1,8 +1,10 @@
+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 7436b7408a045..1bd8a9a65a631 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt
@@ -1,8 +1,10 @@
+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 dd1464b64ce68..51011b66f0781 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt
@@ -1,8 +1,10 @@
+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 abadcda487de8..acd3b2d3a9316 100644
--- a/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt
+++ b/tests/baselines/reference/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt
@@ -1,8 +1,10 @@
+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/esnextmodulekindWithES5Target10.errors.txt b/tests/baselines/reference/esnextmodulekindWithES5Target10.errors.txt
index f4acb47125619..6d6f0ee1c7f09 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 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(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations.
 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 TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     
     namespace N {
diff --git a/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt b/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
index d41afa4b5bc8f..191ac8fdf02ea 100644
--- a/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
+++ b/tests/baselines/reference/esnextmodulekindWithES5Target9.errors.txt
@@ -1,22 +1,22 @@
-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(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 (5 errors) ====
     import d from "mod";
                   ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     import {a} from "mod";
                     ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     import * as M from "mod";
                        ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     export {a};
     
@@ -26,11 +26,11 @@ esnextmodulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'
     
     export * from "mod";
                   ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     export {b} from "mod"
                     ~~~~~
-!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations.
     
     export default d;
     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.errors.txt b/tests/baselines/reference/exportAndImport-es5-amd.errors.txt
new file mode 100644
index 0000000000000..fbd8e108ce86b
--- /dev/null
+++ b/tests/baselines/reference/exportAndImport-es5-amd.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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/exportAsNamespace1(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
index ff31f3962ef4c..1159c91568a33 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=amd).errors.txt
@@ -1,7 +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(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=system).errors.txt b/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
index ff31f3962ef4c..df44389973192 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=system).errors.txt
@@ -1,7 +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(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 ff31f3962ef4c..3ee3aa98ebae4 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace1(module=umd).errors.txt
@@ -1,7 +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.
 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/exportAsNamespace2(module=amd).errors.txt b/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
index ff31f3962ef4c..1159c91568a33 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=amd).errors.txt
@@ -1,7 +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(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 ff31f3962ef4c..df44389973192 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=system).errors.txt
@@ -1,7 +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(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 ff31f3962ef4c..3ee3aa98ebae4 100644
--- a/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace2(module=umd).errors.txt
@@ -1,7 +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.
 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 0e4bd2c40ddf8..f03649ce2aa4c 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=amd).errors.txt
@@ -1,7 +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(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 0e4bd2c40ddf8..6a32c48a93bfc 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=system).errors.txt
@@ -1,7 +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(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 0e4bd2c40ddf8..e62ed7ccf9f5f 100644
--- a/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt
+++ b/tests/baselines/reference/exportAsNamespace3(module=umd).errors.txt
@@ -1,7 +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.
 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
new file mode 100644
index 0000000000000..e46e730ffe438
--- /dev/null
+++ b/tests/baselines/reference/exportAsNamespace4(module=amd).errors.txt
@@ -0,0 +1,24 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7463cadac52aa
--- /dev/null
+++ b/tests/baselines/reference/exportAsNamespace4(module=system).errors.txt
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000000000..e75848124401b
--- /dev/null
+++ b/tests/baselines/reference/exportAsNamespace4(module=umd).errors.txt
@@ -0,0 +1,24 @@
+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_nonExistent.errors.txt b/tests/baselines/reference/exportAsNamespace_nonExistent.errors.txt
index 32dc546b4b404..2a8a7b7e7c210 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 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,21): error TS2307: Cannot find module './nonexistent' or its corresponding type declarations.
 
 
 ==== exportAsNamespace_nonExistent.ts (1 errors) ====
     export * as ns from './nonexistent'; // Error
                         ~~~~~~~~~~~~~~~
-!!! error TS2792: Cannot find module './nonexistent'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module './nonexistent' or its corresponding type declarations.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
new file mode 100644
index 0000000000000..af55cf2bcb992
--- /dev/null
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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 a6c6c01bc22b5..fda68b3fd6ffc 100644
--- a/tests/baselines/reference/exportAssignmentAndDeclaration.js
+++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js
@@ -13,6 +13,7 @@ class C1 {
 export = C1;
 
 //// [foo_0.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     exports.E1 = void 0;
@@ -23,6 +24,34 @@ define(["require", "exports"], function (require, exports) {
         E1[E1["C"] = 2] = "C";
     })(E1 || (exports.E1 = E1 = {}));
     class C1 {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+    }());
+=======
+"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() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return C1;
-});
+}());
+module.exports = C1;
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.errors.txt b/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
new file mode 100644
index 0000000000000..8139a2496da62
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
@@ -0,0 +1,25 @@
+error TS5107: Option '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 7756674cf27ec..2c147fd2d8f97 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.types
+++ b/tests/baselines/reference/exportAssignmentCircularModules.types
@@ -11,7 +11,9 @@ module Foo {
 
 	export var x = foo0.x;
 >x : any
+>  : ^^^
 >foo0.x : any
+>       : ^^^
 >foo0 : typeof foo0
 >     : ^^^^^^^^^^^
 >x : any
@@ -32,7 +34,9 @@ module Foo {
 
 	export var x = foo1.x;
 >x : any
+>  : ^^^
 >foo1.x : any
+>       : ^^^
 >foo1 : typeof foo1
 >     : ^^^^^^^^^^^
 >x : any
@@ -53,7 +57,9 @@ module 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
new file mode 100644
index 0000000000000..08cfa54b0ddbd
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentClass.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e61d4a7a08bfe
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentError.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 dc19391c09d90..a9333cffc3293 100644
--- a/tests/baselines/reference/exportAssignmentError.types
+++ b/tests/baselines/reference/exportAssignmentError.types
@@ -7,6 +7,7 @@ module 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
new file mode 100644
index 0000000000000..f50cfd3039c89
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentFunction.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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/exportAssignmentInterface.errors.txt b/tests/baselines/reference/exportAssignmentInterface.errors.txt
new file mode 100644
index 0000000000000..5819cbfb57ba1
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentInterface.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..08a6ff256afc4
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 8485df8d8a41b..1a1854d7b03f6 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.types
+++ b/tests/baselines/reference/exportAssignmentInternalModule.types
@@ -9,6 +9,7 @@ var n: number = modM.x;
 >n : number
 >  : ^^^^^^
 >modM.x : any
+>       : ^^^
 >modM : typeof modM
 >     : ^^^^^^^^^^^
 >x : any
@@ -21,6 +22,7 @@ module M {
 
 	export var x;
 >x : any
+>  : ^^^
 }
 
 export = M;
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt b/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
new file mode 100644
index 0000000000000..a59a87835dcdd
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.errors.txt
@@ -0,0 +1,25 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..57ef430040935
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..4871c9caa789a
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..47a3c979cdc64
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3194b2bcde931
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..e6bee6ac2e5bb
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..9059f5e6fa00c
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option '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 508a4f38e5dbf..de52ca6a72f8b 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
@@ -5,8 +5,11 @@ module 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
new file mode 100644
index 0000000000000..4687a3ce4e308
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 2119f68a7ff33..3ec8b1fdf2cf7 100644
--- a/tests/baselines/reference/exportAssignmentWithPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithPrivacyError.types
@@ -4,8 +4,11 @@
 interface connectmodule {
     (res, req, next): void;
 >res : any
+>    : ^^^
 >req : any
+>    : ^^^
 >next : any
+>     : ^^^
 }
 interface connectexport {
     use: (mod: connectmodule) => connectexport;
diff --git a/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt b/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
index 465856a9af92f..d1f275d2c57fe 100644
--- a/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectAMD.errors.txt
@@ -1,6 +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.
 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 e7d609e955497..1bdf1d731f8dc 100644
--- a/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectSystem.errors.txt
@@ -1,6 +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.
 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 eaf05918ac298..be409a0a7c40d 100644
--- a/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt
+++ b/tests/baselines/reference/exportClassNameWithObjectUMD.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..6adc1bffd0dce
--- /dev/null
+++ b/tests/baselines/reference/exportDeclarationForModuleOrEnumWithMemberOfSameName(module=system).errors.txt
@@ -0,0 +1,19 @@
+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 9113e3fa85c1e..c0aadda3896da 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,9 +12,7 @@
     };
 
 //// [exportDeclareClass1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    ;
-    ;
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+;
+;
diff --git a/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt b/tests/baselines/reference/exportDefaultAsyncFunction2.errors.txt
index 1493eabe3f369..90e5a3e61775f 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 a94ad0f12d4a1..db979c7f77f0e 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 04733e02f0de0..449e44d6e43f5 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 e99b663eddc9c..1ef7626cc94c4 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/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
new file mode 100644
index 0000000000000..8d8f3cb86598a
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=es5).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..8d8f3cb86598a
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=amd,target=esnext).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..94c89d6851f79
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=es5).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..94c89d6851f79
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyArrayBindingPattern(module=system,target=esnext).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..e4c070bf9a248
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=es5).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..e4c070bf9a248
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=amd,target=esnext).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..5b1950bd36383
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=es5).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..5b1950bd36383
--- /dev/null
+++ b/tests/baselines/reference/exportEmptyObjectBindingPattern(module=system,target=esnext).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..7475b379fa220
--- /dev/null
+++ b/tests/baselines/reference/exportEqualCallable.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 5b8019a84ef5c..32737681c30b4 100644
--- a/tests/baselines/reference/exportEqualCallable.types
+++ b/tests/baselines/reference/exportEqualCallable.types
@@ -8,6 +8,7 @@ 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 5215d665060f1..0678fe703920e 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 d94a01d5ee77e..5e0f90c1f89d2 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -17,19 +17,17 @@ 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]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var server;
-    return server;
-});
+"use strict";
+var server;
+module.exports = server;
 //// [exportEqualErrorType_1.js]
-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 ''.
-});
+"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 ''.
diff --git a/tests/baselines/reference/exportEqualErrorType.symbols b/tests/baselines/reference/exportEqualErrorType.symbols
index fe9065915fc44..d31bd04ec8c3a 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 6b6008704b03e..9ad40253b1370 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
new file mode 100644
index 0000000000000..ca17006547792
--- /dev/null
+++ b/tests/baselines/reference/exportEqualNamespaces.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..109ada07a0b38
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsAmd.errors.txt
@@ -0,0 +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 '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/exportEqualsUmd.errors.txt b/tests/baselines/reference/exportEqualsUmd.errors.txt
new file mode 100644
index 0000000000000..b0deffd6c65f7
--- /dev/null
+++ b/tests/baselines/reference/exportEqualsUmd.errors.txt
@@ -0,0 +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 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
new file mode 100644
index 0000000000000..b48d4b1a5ddb8
--- /dev/null
+++ b/tests/baselines/reference/exportImport.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..08a44fab214f6
--- /dev/null
+++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
@@ -0,0 +1,63 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a9e71232f82a7
--- /dev/null
+++ b/tests/baselines/reference/exportImportMultipleFiles.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 a48cac713405b..0dc9157861f77 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -7,6 +7,7 @@ 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
@@ -27,10 +28,15 @@ 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");
@@ -39,6 +45,7 @@ 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
new file mode 100644
index 0000000000000..87b37a469c97e
--- /dev/null
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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/exportNonInitializedVariablesAMD.errors.txt b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
index 6b757c89a9ea9..b3f5ccffebc75 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.errors.txt
@@ -1,9 +1,11 @@
+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 dd7b763f5af3b..b95c5b458b001 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesInIfThenStatementNoCrash1(module=system).errors.txt
@@ -1,8 +1,10 @@
+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 87936e80db087..1cc3e456f12c2 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesSystem.errors.txt
@@ -1,9 +1,11 @@
+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 d3139867a14d7..d94ad97d32096 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.errors.txt
@@ -1,9 +1,11 @@
+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
new file mode 100644
index 0000000000000..0784723ac4eba
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=amd,target=es5).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..0784723ac4eba
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=amd,target=esnext).errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..853c7607d5bd4
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=system,target=es5).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..853c7607d5bd4
--- /dev/null
+++ b/tests/baselines/reference/exportObjectRest(module=system,target=esnext).errors.txt
@@ -0,0 +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.
+
+
+!!! 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 f1a455adfcba3..88272ae169bb1 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,12 +6,10 @@ export function a() {
 }
 
 //// [exportSameNameFuncVar.js]
-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() {
-    }
-});
+"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 4402aed8a528c..8748c15b93066 100644
--- a/tests/baselines/reference/exportStar-amd.errors.txt
+++ b/tests/baselines/reference/exportStar-amd.errors.txt
@@ -1,8 +1,10 @@
+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/exportStarForValues.errors.txt b/tests/baselines/reference/exportStarForValues.errors.txt
new file mode 100644
index 0000000000000..b4d58eee90433
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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 aa9264c0320ef..871cd5b0f56e1 100644
--- a/tests/baselines/reference/exportStarForValues.types
+++ b/tests/baselines/reference/exportStarForValues.types
@@ -3,9 +3,11 @@
 === 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
new file mode 100644
index 0000000000000..3142d441005e9
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues10.errors.txt
@@ -0,0 +1,14 @@
+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 802ef0b3fa4de..6247012e71de2 100644
--- a/tests/baselines/reference/exportStarForValues10.types
+++ b/tests/baselines/reference/exportStarForValues10.types
@@ -10,6 +10,7 @@ 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
new file mode 100644
index 0000000000000..5680653d5a3fb
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues2.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 a29af65fda472..fc56e15a695df 100644
--- a/tests/baselines/reference/exportStarForValues2.types
+++ b/tests/baselines/reference/exportStarForValues2.types
@@ -3,6 +3,7 @@
 === 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
new file mode 100644
index 0000000000000..0640eb34d952a
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues3.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option '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 5462a43e429be..a148ed78e8bb0 100644
--- a/tests/baselines/reference/exportStarForValues3.types
+++ b/tests/baselines/reference/exportStarForValues3.types
@@ -3,10 +3,12 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
+>  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 var x = 1;
@@ -18,6 +20,7 @@ var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 var x = 1;
@@ -29,6 +32,7 @@ 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
new file mode 100644
index 0000000000000..fd09144bdd859
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues4.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 a2fb7cee6f67f..3d6fb0b98bd78 100644
--- a/tests/baselines/reference/exportStarForValues4.types
+++ b/tests/baselines/reference/exportStarForValues4.types
@@ -3,10 +3,12 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
+>  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 export * from "file3"
@@ -19,6 +21,7 @@ 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
new file mode 100644
index 0000000000000..04e9a2de78350
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues5.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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 bbb495b7d300c..a4c35c407a189 100644
--- a/tests/baselines/reference/exportStarForValues5.types
+++ b/tests/baselines/reference/exportStarForValues5.types
@@ -3,9 +3,11 @@
 === 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
new file mode 100644
index 0000000000000..61aeeb4d979fb
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues6.errors.txt
@@ -0,0 +1,10 @@
+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 52c9f8b191aa2..e1cbed0fcea6e 100644
--- a/tests/baselines/reference/exportStarForValues6.types
+++ b/tests/baselines/reference/exportStarForValues6.types
@@ -3,6 +3,7 @@
 === 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
new file mode 100644
index 0000000000000..7f3335da1330a
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues7.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 feb0e4b106698..922de7ca91316 100644
--- a/tests/baselines/reference/exportStarForValues7.types
+++ b/tests/baselines/reference/exportStarForValues7.types
@@ -3,6 +3,7 @@
 === 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
new file mode 100644
index 0000000000000..b497d6a214095
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues8.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option '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 9a9b611509790..1db59be84051b 100644
--- a/tests/baselines/reference/exportStarForValues8.types
+++ b/tests/baselines/reference/exportStarForValues8.types
@@ -3,10 +3,12 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
+>  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 export var x = 1;
@@ -18,6 +20,7 @@ export var x = 1;
 === file3.ts ===
 export interface B { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 export var x = 1;
@@ -29,6 +32,7 @@ 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
new file mode 100644
index 0000000000000..aaf8f74716874
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValues9.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 470cd248d08b2..ddc9317942a05 100644
--- a/tests/baselines/reference/exportStarForValues9.types
+++ b/tests/baselines/reference/exportStarForValues9.types
@@ -3,10 +3,12 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
+>  : ^^^
 
 === file2.ts ===
 export interface A { x }
 >x : any
+>  : ^^^
 
 export * from "file1"
 export * from "file3"
@@ -19,6 +21,7 @@ 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
new file mode 100644
index 0000000000000..3f7dfcd355d4f
--- /dev/null
+++ b/tests/baselines/reference/exportStarForValuesInSystem.errors.txt
@@ -0,0 +1,10 @@
+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 104f06d759b66..f33c43ad73c9c 100644
--- a/tests/baselines/reference/exportStarForValuesInSystem.types
+++ b/tests/baselines/reference/exportStarForValuesInSystem.types
@@ -3,6 +3,7 @@
 === file1.ts ===
 export interface Foo { x }
 >x : any
+>  : ^^^
 
 === file2.ts ===
 export * from "file1"
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 2e0c9319ee372..c129df85ae67f 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,6 +20,7 @@ namespace NS1 {
 }
 
 //// [exportedBlockScopedDeclarations.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -43,3 +44,47 @@ define(["require", "exports"], function (require, exports) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 = {}));
+});
+=======
+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 = {}));
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
new file mode 100644
index 0000000000000..fcc06f0751d10
--- /dev/null
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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 935afdee8bc0c..0900ab173c2cb 100644
--- a/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
+++ b/tests/baselines/reference/exportedInterfaceInaccessibleInCallbackInModule.types
@@ -4,6 +4,7 @@
 export interface ProgressCallback {
 	(progress:any):any;
 >progress : any
+>         : ^^^
 }	
 
 // --- Generic promise
@@ -21,9 +22,11 @@ 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>;
@@ -36,6 +39,7 @@ 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
new file mode 100644
index 0000000000000..fb6b7a2743519
--- /dev/null
+++ b/tests/baselines/reference/exportedVariable1.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..6356281c9e6b6
--- /dev/null
+++ b/tests/baselines/reference/exportingContainingVisibleType.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0e8bd2772b0ce
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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 3edfb621fe651..1eb82483d7e5f 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.types
+++ b/tests/baselines/reference/exportsAndImports1-amd.types
@@ -47,6 +47,7 @@ module M {
 
     export var x;
 >x : any
+>  : ^^^
 }
 module N {
     export interface I {
diff --git a/tests/baselines/reference/exportsAndImports2-amd.errors.txt b/tests/baselines/reference/exportsAndImports2-amd.errors.txt
new file mode 100644
index 0000000000000..63063504aa904
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports2-amd.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..524d3ac67f62d
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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 2db1dd72527e5..a840af407a91c 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.types
+++ b/tests/baselines/reference/exportsAndImports3-amd.types
@@ -47,6 +47,7 @@ export module M {
 
     export var x;
 >x : any
+>  : ^^^
 }
 export module N {
     export interface I {
diff --git a/tests/baselines/reference/exportsAndImports4-amd.errors.txt b/tests/baselines/reference/exportsAndImports4-amd.errors.txt
new file mode 100644
index 0000000000000..9551ab300f3e3
--- /dev/null
+++ b/tests/baselines/reference/exportsAndImports4-amd.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option '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/exportsInAmbientModules1.errors.txt b/tests/baselines/reference/exportsInAmbientModules1.errors.txt
new file mode 100644
index 0000000000000..51aeb42533ebe
--- /dev/null
+++ b/tests/baselines/reference/exportsInAmbientModules1.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..2e7d3fd651591
--- /dev/null
+++ b/tests/baselines/reference/exportsInAmbientModules2.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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/extensionLoadingPriority(moduleresolution=classic).errors.txt b/tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
new file mode 100644
index 0000000000000..7974b162a5b2a
--- /dev/null
+++ b/tests/baselines/reference/extensionLoadingPriority(moduleresolution=classic).errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..bf716b236578c
--- /dev/null
+++ b/tests/baselines/reference/externalModuleAssignToVar.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
new file mode 100644
index 0000000000000..3a0d449b2a0cf
--- /dev/null
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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 04c0fc77ed4da..b83e06121b868 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,6 +7,7 @@ export class C {
 }
 
 //// [fieldAndGetterWithSameName.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -16,3 +17,36 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.C = C;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
new file mode 100644
index 0000000000000..71d1329b520c5
--- /dev/null
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d7717ef85086b
--- /dev/null
+++ b/tests/baselines/reference/generatorES6InAMDModule.errors.txt
@@ -0,0 +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 '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 c2e2afd76a4e6..dec20f112f4de 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.types
+++ b/tests/baselines/reference/generatorES6InAMDModule.types
@@ -7,4 +7,5 @@ export function* foo() {
 
     yield
 >yield : any
+>      : ^^^
 }
diff --git a/tests/baselines/reference/genericClassesInModule2.errors.txt b/tests/baselines/reference/genericClassesInModule2.errors.txt
new file mode 100644
index 0000000000000..f17d50109f04d
--- /dev/null
+++ b/tests/baselines/reference/genericClassesInModule2.errors.txt
@@ -0,0 +1,25 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..208c4e760cb76
--- /dev/null
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 46816fa649c31..5775fd17c89aa 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,6 +25,7 @@ export class BuildResult<A, B, C>{
 
 
 //// [genericMemberFunction.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -54,3 +55,79 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.BuildResult = BuildResult;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+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 };
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
index 2f06b05362e9c..1ea374a3c4e2d 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors1.errors.txt
@@ -1,6 +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.
 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 module TypeScript {
       class PullSymbol { }
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 6dcf02710e6c3..3c05d851610d1 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,6 +11,7 @@ export class DbSet<T> {
 
 
 //// [genericReturnTypeFromGetter1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -20,3 +21,38 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.DbSet = DbSet;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt b/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
new file mode 100644
index 0000000000000..a1058a1f87dd2
--- /dev/null
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.errors.txt
@@ -0,0 +1,23 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a24f0f4bdf5da
--- /dev/null
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 ebe43ce2e3572..e556e562d9148 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,6 +684,7 @@ export declare module eaM {
 }
 
 //// [giant.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -703,6 +704,95 @@ define(["require", "exports"], function (require, exports) {
         MAX DEPTH 3 LEVELS
     */
     const p = "propName";
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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";
+=======
+"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) {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     var V;
     function F() { }
     ;
@@ -725,10 +815,11 @@ define(["require", "exports"], function (require, exports) {
         static get tgF() { }
     }
     var M;
-    (function (M_1) {
+    (function (M) {
         var V;
         function F() { }
         ;
+<<<<<<< HEAD
         class C {
             constructor() { }
             pF() { }
@@ -770,9 +861,94 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(M || (M = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        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 = {}));
+=======
+        var C = /** @class */ (function () {
+            function C() {
+            }
+            return C;
+        }());
+        ;
+        ;
+        ;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         function eF() { }
-        M_1.eF = eF;
+        M.eF = eF;
         ;
+<<<<<<< HEAD
         class eC {
             constructor() { }
             pF() { }
@@ -815,10 +991,100 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(eM = M_1.eM || (M_1.eM = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        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 = {}));
+=======
+        var eC = /** @class */ (function () {
+            function eC() {
+            }
+            return eC;
+        }());
+        M.eC = eC;
+        ;
+        ;
+        ;
+        ;
+        ;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         ;
     })(M || (M = {}));
     function eF() { }
+    M_1.eF = eF;
     ;
+<<<<<<< HEAD
     class eC {
         constructor() { }
         pF() { }
@@ -838,11 +1104,105 @@ define(["require", "exports"], function (require, exports) {
         static get tgF() { }
     }
     exports.eC = eC;
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    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 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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     var eM;
-    (function (eM_1) {
+    (function (eM) {
         var V;
         function F() { }
         ;
+<<<<<<< HEAD
         class C {
             constructor() { }
             pF() { }
@@ -884,9 +1244,94 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(M || (M = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        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 = {}));
+=======
+        var C = /** @class */ (function () {
+            function C() {
+            }
+            return C;
+        }());
+        ;
+        ;
+        ;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         function eF() { }
-        eM_1.eF = eF;
+        eM.eF = eF;
         ;
+<<<<<<< HEAD
         class eC {
             constructor() { }
             pF() { }
@@ -929,10 +1374,303 @@ define(["require", "exports"], function (require, exports) {
             ;
             ;
         })(eM = eM_1.eM || (eM_1.eM = {}));
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        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_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 = {}));
+=======
+        var eC = /** @class */ (function () {
+            function eC() {
+            }
+            return eC;
+        }());
+        eM.eC = eC;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        ;
+        ;
+        ;
+        ;
+        ;
+        ;
+    })(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) {
+    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_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_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 || (exports.eM = eM = {}));
+    })(eM = eM_1.eM || (eM_1.eM = {}));
     ;
-});
+})(eM || (exports.eM = eM = {}));
+;
 
 
 //// [giant.d.ts]
diff --git a/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt b/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
index 7a67132f7f441..0651e0692d375 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=amd).errors.txt
@@ -1,7 +1,9 @@
 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 f14c00104a9b4..5977c517fad8c 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=system).errors.txt
@@ -1,9 +1,11 @@
 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 f14c00104a9b4..dcaba12d2bfd4 100644
--- a/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt
+++ b/tests/baselines/reference/impliedNodeFormatEmit1(module=umd).errors.txt
@@ -1,9 +1,11 @@
 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/importCallExpressionAsyncES5AMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
new file mode 100644
index 0000000000000..e9e9f0fcf2e97
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.errors.txt
@@ -0,0 +1,33 @@
+error TS5107: Option '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/importCallExpressionAsyncES5System.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
new file mode 100644
index 0000000000000..8dd6a353a2554
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES5System.errors.txt
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000000000..346e820da515c
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.errors.txt
@@ -0,0 +1,33 @@
+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/importCallExpressionAsyncES6AMD.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
new file mode 100644
index 0000000000000..e9e9f0fcf2e97
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.errors.txt
@@ -0,0 +1,33 @@
+error TS5107: Option '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/importCallExpressionAsyncES6System.errors.txt b/tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
new file mode 100644
index 0000000000000..8dd6a353a2554
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES6System.errors.txt
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000000000..346e820da515c
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.errors.txt
@@ -0,0 +1,33 @@
+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/importCallExpressionES5AMD.errors.txt b/tests/baselines/reference/importCallExpressionES5AMD.errors.txt
new file mode 100644
index 0000000000000..31f9e39e63788
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES5AMD.errors.txt
@@ -0,0 +1,31 @@
+error TS5107: Option '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/importCallExpressionES5System.errors.txt b/tests/baselines/reference/importCallExpressionES5System.errors.txt
new file mode 100644
index 0000000000000..0fb7315d37773
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES5System.errors.txt
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000000000..ff981b39efa20
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES5UMD.errors.txt
@@ -0,0 +1,31 @@
+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/importCallExpressionES6AMD.errors.txt b/tests/baselines/reference/importCallExpressionES6AMD.errors.txt
new file mode 100644
index 0000000000000..31f9e39e63788
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES6AMD.errors.txt
@@ -0,0 +1,31 @@
+error TS5107: Option '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/importCallExpressionES6System.errors.txt b/tests/baselines/reference/importCallExpressionES6System.errors.txt
new file mode 100644
index 0000000000000..0fb7315d37773
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES6System.errors.txt
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 0000000000000..ff981b39efa20
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionES6UMD.errors.txt
@@ -0,0 +1,31 @@
+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/importCallExpressionInAMD1.errors.txt b/tests/baselines/reference/importCallExpressionInAMD1.errors.txt
new file mode 100644
index 0000000000000..cbb94db928731
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInAMD1.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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/importCallExpressionInAMD2.errors.txt b/tests/baselines/reference/importCallExpressionInAMD2.errors.txt
new file mode 100644
index 0000000000000..ba22b5c026a43
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInAMD2.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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.types b/tests/baselines/reference/importCallExpressionInAMD2.types
index 940c187c061dc..e3ce512be2beb 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.types
+++ b/tests/baselines/reference/importCallExpressionInAMD2.types
@@ -32,11 +32,15 @@ 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
@@ -44,7 +48,9 @@ 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
new file mode 100644
index 0000000000000..a63ab9546cebf
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInAMD3.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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/importCallExpressionInAMD4.errors.txt b/tests/baselines/reference/importCallExpressionInAMD4.errors.txt
new file mode 100644
index 0000000000000..ddcb02d3e13df
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInAMD4.errors.txt
@@ -0,0 +1,43 @@
+error TS5107: Option '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.types b/tests/baselines/reference/importCallExpressionInAMD4.types
index 1f5c390e64b71..2b2ca33e0e0da 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.types
+++ b/tests/baselines/reference/importCallExpressionInAMD4.types
@@ -28,6 +28,7 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
+>        : ^^^
 
 class C {
 >C : C
@@ -73,7 +74,9 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -91,15 +94,19 @@ 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")
@@ -113,7 +120,9 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
+>                          : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -175,7 +184,9 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -193,15 +204,19 @@ 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")
@@ -215,7 +230,9 @@ 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/importCallExpressionInExportEqualsAMD.errors.txt b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
new file mode 100644
index 0000000000000..02fb46d036916
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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/importCallExpressionInExportEqualsUMD.errors.txt b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
new file mode 100644
index 0000000000000..2da8a6aaacf89
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.errors.txt
@@ -0,0 +1,11 @@
+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/importCallExpressionInSystem1.errors.txt b/tests/baselines/reference/importCallExpressionInSystem1.errors.txt
new file mode 100644
index 0000000000000..9d27f4d7981f3
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInSystem1.errors.txt
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000000..8be7f76ab8ad7
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInSystem2.errors.txt
@@ -0,0 +1,19 @@
+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 2ffd403bec514..9cb7891c26e74 100644
--- a/tests/baselines/reference/importCallExpressionInSystem2.types
+++ b/tests/baselines/reference/importCallExpressionInSystem2.types
@@ -32,11 +32,15 @@ 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
@@ -44,7 +48,9 @@ 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
new file mode 100644
index 0000000000000..32beb24605369
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInSystem3.errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..2551f3a90f1b7
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInSystem4.errors.txt
@@ -0,0 +1,43 @@
+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 cef7710895ee0..5392040581edf 100644
--- a/tests/baselines/reference/importCallExpressionInSystem4.types
+++ b/tests/baselines/reference/importCallExpressionInSystem4.types
@@ -28,6 +28,7 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
+>        : ^^^
 
 class C {
 >C : C
@@ -73,7 +74,9 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -91,15 +94,19 @@ 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")
@@ -113,7 +120,9 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
+>                          : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -175,7 +184,9 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -193,15 +204,19 @@ 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")
@@ -215,7 +230,9 @@ 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
new file mode 100644
index 0000000000000..bf7033337d29f
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInUMD1.errors.txt
@@ -0,0 +1,19 @@
+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/importCallExpressionInUMD2.errors.txt b/tests/baselines/reference/importCallExpressionInUMD2.errors.txt
new file mode 100644
index 0000000000000..1cf69496ef60f
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInUMD2.errors.txt
@@ -0,0 +1,19 @@
+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.types b/tests/baselines/reference/importCallExpressionInUMD2.types
index 55a9c46617fe4..aa3ac180655b9 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.types
+++ b/tests/baselines/reference/importCallExpressionInUMD2.types
@@ -32,11 +32,15 @@ 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
@@ -44,7 +48,9 @@ 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
new file mode 100644
index 0000000000000..0bcdd58f718b6
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInUMD3.errors.txt
@@ -0,0 +1,16 @@
+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/importCallExpressionInUMD4.errors.txt b/tests/baselines/reference/importCallExpressionInUMD4.errors.txt
new file mode 100644
index 0000000000000..f3dfe5f8d8181
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInUMD4.errors.txt
@@ -0,0 +1,43 @@
+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.types b/tests/baselines/reference/importCallExpressionInUMD4.types
index 4cb77bf0414a0..e5f99a161eab3 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.types
+++ b/tests/baselines/reference/importCallExpressionInUMD4.types
@@ -28,6 +28,7 @@ export function backup() { return "backup"; }
 === 2.ts ===
 declare var console: any;
 >console : any
+>        : ^^^
 
 class C {
 >C : C
@@ -73,7 +74,9 @@ class C {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -91,15 +94,19 @@ 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")
@@ -113,7 +120,9 @@ class C {
 
             console.log(one.backup());
 >console.log(one.backup()) : any
+>                          : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -175,7 +184,9 @@ export class D {
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
+>                        : ^^^
 >console.log : any
+>            : ^^^
 >console : any
 >        : ^^^
 >log : any
@@ -193,15 +204,19 @@ 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")
@@ -215,7 +230,9 @@ 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
new file mode 100644
index 0000000000000..3c63be1145fa7
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionInUMD5.errors.txt
@@ -0,0 +1,14 @@
+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.types b/tests/baselines/reference/importCallExpressionInUMD5.types
index a597d0eff5a03..4de7478aab0df 100644
--- a/tests/baselines/reference/importCallExpressionInUMD5.types
+++ b/tests/baselines/reference/importCallExpressionInUMD5.types
@@ -21,7 +21,9 @@ 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
new file mode 100644
index 0000000000000..076931f140681
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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.types b/tests/baselines/reference/importCallExpressionNestedAMD.types
index b6d446cf46507..11c285a30fdde 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.types
@@ -11,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..076931f140681
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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.types b/tests/baselines/reference/importCallExpressionNestedAMD2.types
index 7d66061c112fd..f8d6a4bf19c03 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.types
@@ -11,6 +11,7 @@ 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/importCallExpressionNestedSystem.errors.txt b/tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
new file mode 100644
index 0000000000000..df96a9b44fa78
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.errors.txt
@@ -0,0 +1,11 @@
+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 016d56fbe7dd7..3d320c72d33b6 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.types
@@ -11,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..df96a9b44fa78
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.errors.txt
@@ -0,0 +1,11 @@
+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 b6112d640a3ed..2704d3a6d0986 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.types
@@ -11,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..44fd274c9d149
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.errors.txt
@@ -0,0 +1,11 @@
+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.types b/tests/baselines/reference/importCallExpressionNestedUMD.types
index a4bcb595521bb..0987715c279a7 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.types
@@ -11,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..44fd274c9d149
--- /dev/null
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.errors.txt
@@ -0,0 +1,11 @@
+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.types b/tests/baselines/reference/importCallExpressionNestedUMD2.types
index c4cbc3ebb08a0..e0a8d1db3e130 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.types
@@ -11,6 +11,7 @@ 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/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 0ac2479e3ed3d..de60de73c1a28 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,12 +12,10 @@ var b: a;
 
 
 //// [importDeclWithClassModifiers.js]
-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;
-});
+"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 e419c438c0413..2313d3caacbc4 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.errors.txt
+++ b/tests/baselines/reference/importDeclWithExportModifier.errors.txt
@@ -1,7 +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.
 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) ====
     module x {
         interface c {
diff --git a/tests/baselines/reference/importDefaultBindingDefer.errors.txt b/tests/baselines/reference/importDefaultBindingDefer.errors.txt
new file mode 100644
index 0000000000000..d489281ef85f3
--- /dev/null
+++ b/tests/baselines/reference/importDefaultBindingDefer.errors.txt
@@ -0,0 +1,14 @@
+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 f647f0914868d..f160cc1414c6b 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 : () => void
->      : ^^^^^^^^^^
+>defer : any
+>      : ^^^
 
 defer();
->defer() : void
->        : ^^^^
->defer : () => void
->      : ^^^^^^^^^^
+>defer() : any
+>        : ^^^
+>defer : any
+>      : ^^^
 
diff --git a/tests/baselines/reference/importDeferComments.errors.txt b/tests/baselines/reference/importDeferComments.errors.txt
new file mode 100644
index 0000000000000..56b486f8344d7
--- /dev/null
+++ b/tests/baselines/reference/importDeferComments.errors.txt
@@ -0,0 +1,11 @@
+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 6f06fb95216ac..36fb5b224a91a 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 : typeof aNs
->    : ^^^^^^^^^^
+>aNs : any
+>    : ^^^
 
diff --git a/tests/baselines/reference/importDeferInvalidDefault.errors.txt b/tests/baselines/reference/importDeferInvalidDefault.errors.txt
index db10e58190f7d..f73208bd269ad 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 e0f3491c6329f..1bcd8af7587e5 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 dd548fc59340a..34b190c10fa5b 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 ae22c6fd8d417..185ee3a294788 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 ef2015d6537b3..f802be536ffec 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 8f92f52fa0ee5..925c583e31229 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 77f3959cd7e06..83b170aa34388 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 5568523603e08..ff761ef0b9d79 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/importDeferTypeConflict1.errors.txt b/tests/baselines/reference/importDeferTypeConflict1.errors.txt
index 138cfa68e9b36..a97903b2cf730 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 0577f6a08cb7c..463ebf0241037 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 961367f241e5b..9771ff173bdbf 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 ea2a7ef944685..770da70492fd5 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 2387d3e34ac4e..6453749d15bd6 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 1c06d70469687..393d7ff039cae 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 ea867e3cfdc51..699eea79269e6 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 bbcc915ad31bc..33b0d0cf855a4 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/importHelpers.js b/tests/baselines/reference/importHelpers.js
index 546f116bd9c2c..28c5ac162193b 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`;
 
-//// [tslib.d.ts]
+//// [index.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 9e739f9745817..dedab7969290a 100644
--- a/tests/baselines/reference/importHelpers.symbols
+++ b/tests/baselines/reference/importHelpers.symbols
@@ -76,41 +76,98 @@ const result = id`hello world`;
 >result : Symbol(result, Decl(script.ts, 15, 5))
 >id : Symbol(id, Decl(script.ts, 9, 1))
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
+>d : Symbol(d, Decl(index.d.ts, 0, 34))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
->t : Symbol(t, Decl(tslib.d.ts, --, --))
->sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+>__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))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >key : Symbol(key, Decl(tslib.d.ts, --, --))
 >desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+=======
+>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
+>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>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))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+<<<<<<< HEAD
 >__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
 >thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
 >_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
@@ -118,10 +175,27 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__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))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray;
->__makeTemplateObject : Symbol(__makeTemplateObject, Decl(tslib.d.ts, --, --))
->cooked : Symbol(cooked, Decl(tslib.d.ts, --, --))
->raw : Symbol(raw, Decl(tslib.d.ts, --, --))
+>__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))
 >TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpers.types b/tests/baselines/reference/importHelpers.types
index d786b11dda4f9..56dbec9860293 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"
 >              : ^^^^^^^^^^^^^
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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
new file mode 100644
index 0000000000000..81d8ceb204ef4
--- /dev/null
+++ b/tests/baselines/reference/importHelpersAmd.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 29488bdd09573..023575ad1fc83 100644
--- a/tests/baselines/reference/importHelpersAmd.types
+++ b/tests/baselines/reference/importHelpersAmd.types
@@ -30,6 +30,7 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
+>  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -37,6 +38,7 @@ export declare function __rest(t: any, propertyNames: string[]): any;
 >__rest : (t: any, propertyNames: string[]) => any
 >       : ^ ^^   ^^             ^^        ^^^^^   
 >t : any
+>  : ^^^
 >propertyNames : string[]
 >              : ^^^^^^^^
 
@@ -46,9 +48,11 @@ 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
@@ -62,13 +66,17 @@ 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
@@ -78,6 +86,7 @@ export declare function __generator(thisArg: any, body: Function): any;
 >__generator : (thisArg: any, body: Function) => any
 >            : ^       ^^   ^^    ^^        ^^^^^   
 >thisArg : any
+>        : ^^^
 >body : Function
 >     : ^^^^^^^^
 
@@ -85,5 +94,7 @@ 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
new file mode 100644
index 0000000000000..04b54604e2f05
--- /dev/null
+++ b/tests/baselines/reference/importHelpersES6.errors.txt
@@ -0,0 +1,26 @@
+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 918648cdbd0f9..d123080dc354c 100644
--- a/tests/baselines/reference/importHelpersES6.types
+++ b/tests/baselines/reference/importHelpersES6.types
@@ -3,9 +3,11 @@
 === a.ts ===
 declare var dec: any;
 >dec : any
+>    : ^^^
 
 @dec export class A {
 >dec : any
+>    : ^^^
 >A : A
 >  : ^
 
@@ -35,10 +37,13 @@ declare var dec: any;
 >g : (u: any) => u is A
 >  : ^ ^^^^^^^^^^^^^^^^
 >u : any
+>  : ^^^
 >#x in u : boolean
 >        : ^^^^^^^
 >#x : any
+>   : ^^^
 >u : any
+>  : ^^^
 }
 
 const o = { a: 1 };
@@ -74,9 +79,11 @@ 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
@@ -90,13 +97,17 @@ 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
@@ -106,22 +117,33 @@ 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 2f8719c92660a..32a477894621a 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -24,7 +24,7 @@ class C {
     }
 }
 
-//// [tslib.d.ts]
+//// [index.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 8327667d7c4e7..33d1bc1a5366a 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.symbols
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.symbols
@@ -48,41 +48,98 @@ class C {
     }
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
+>d : Symbol(d, Decl(index.d.ts, 0, 34))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
->t : Symbol(t, Decl(tslib.d.ts, --, --))
->sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+>__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))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >key : Symbol(key, Decl(tslib.d.ts, --, --))
 >desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+=======
+>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
+>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>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))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+<<<<<<< HEAD
 >__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
 >thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
 >_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
@@ -90,4 +147,21 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__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))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.types b/tests/baselines/reference/importHelpersInIsolatedModules.types
index 85f1bbc2d93e5..bcec951637ca5 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.types
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.types
@@ -60,7 +60,7 @@ class C {
     }
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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 bc7400c277637..b600c157e2068 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} />
 
-//// [tslib.d.ts]
+//// [index.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 572eb929f0e0f..2fe7743bf4c70 100644
--- a/tests/baselines/reference/importHelpersInTsx.symbols
+++ b/tests/baselines/reference/importHelpersInTsx.symbols
@@ -22,41 +22,98 @@ const x = <span {...o} />
 >x : Symbol(x, Decl(script.tsx, 2, 5))
 >o : Symbol(o, Decl(script.tsx, 1, 11))
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
+>d : Symbol(d, Decl(index.d.ts, 0, 34))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __assign(t: any, ...sources: any[]): any;
->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --))
->t : Symbol(t, Decl(tslib.d.ts, --, --))
->sources : Symbol(sources, Decl(tslib.d.ts, --, --))
+>__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))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
+<<<<<<< HEAD
 >__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(tslib.d.ts, --, --))
 >key : Symbol(key, Decl(tslib.d.ts, --, --))
 >desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(tslib.d.ts, --, --))
+>key : Symbol(key, Decl(tslib.d.ts, --, --))
+>desc : Symbol(desc, Decl(tslib.d.ts, --, --))
+=======
+>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
+>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
+>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))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __metadata(metadataKey: any, metadataValue: any): Function;
+<<<<<<< HEAD
 >__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, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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, --, --))
+=======
+>__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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any;
+<<<<<<< HEAD
 >__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --))
 >thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --))
 >_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --))
@@ -64,4 +121,21 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >generator : Symbol(generator, Decl(tslib.d.ts, --, --))
 >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>__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(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, --, --))
+=======
+>__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))
+>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))
+>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, --, --))
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
diff --git a/tests/baselines/reference/importHelpersInTsx.types b/tests/baselines/reference/importHelpersInTsx.types
index 3d32a7cdead3b..b166d5cb97047 100644
--- a/tests/baselines/reference/importHelpersInTsx.types
+++ b/tests/baselines/reference/importHelpersInTsx.types
@@ -28,7 +28,7 @@ const x = <span {...o} />
 >     : ^^^
 >o : any
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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 47c053824e89c..4c58dcf6c2063 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -1,3 +1,4 @@
+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'.
@@ -7,6 +8,7 @@ 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 92a47c28a2fb0..652f4ef43c909 100644
--- a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
@@ -1,3 +1,4 @@
+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'.
@@ -5,6 +6,7 @@ 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 05586f6d42048..57d046a360081 100644
--- a/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.errors.txt
@@ -1,8 +1,10 @@
+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 93d201ee1a591..ed5940d20f2e7 100644
--- a/tests/baselines/reference/importHelpersNoModule.errors.txt
+++ b/tests/baselines/reference/importHelpersNoModule.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..10450e3f12f6c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersOutFile.errors.txt
@@ -0,0 +1,23 @@
+error TS5107: Option '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 af999d02b3515..9bf61793f476f 100644
--- a/tests/baselines/reference/importHelpersOutFile.types
+++ b/tests/baselines/reference/importHelpersOutFile.types
@@ -40,6 +40,7 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
+>  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -49,9 +50,11 @@ 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
@@ -65,13 +68,17 @@ 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
new file mode 100644
index 0000000000000..55667298e5b17
--- /dev/null
+++ b/tests/baselines/reference/importHelpersSystem.errors.txt
@@ -0,0 +1,20 @@
+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 19c7d184d6df1..270b9f92636b7 100644
--- a/tests/baselines/reference/importHelpersSystem.types
+++ b/tests/baselines/reference/importHelpersSystem.types
@@ -30,6 +30,7 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >__assign : (t: any, ...sources: any[]) => any
 >         : ^ ^^   ^^^^^       ^^     ^^^^^   
 >t : any
+>  : ^^^
 >sources : any[]
 >        : ^^^^^
 
@@ -39,9 +40,11 @@ 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
@@ -55,13 +58,17 @@ 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
new file mode 100644
index 0000000000000..141210d0665cd
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,16 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..39c8e6d0d2a12
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,16 @@
+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=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
new file mode 100644
index 0000000000000..58a5e5b8bdf6e
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=amd).types
@@ -19,4 +19,5 @@ 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
new file mode 100644
index 0000000000000..5293f7ed56503
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,14 @@
+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 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=true,module=system).types
@@ -19,4 +19,5 @@ 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
new file mode 100644
index 0000000000000..9fdf9d0c057da
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,19 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..fa3348a608424
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,19 @@
+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=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
new file mode 100644
index 0000000000000..266be01be8043
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=amd).types
@@ -36,4 +36,5 @@ 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
new file mode 100644
index 0000000000000..f64e9f067def7
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,17 @@
+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 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=true,module=system).types
@@ -36,4 +36,5 @@ 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
new file mode 100644
index 0000000000000..6e988f05c114f
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,12 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..852516e62df99
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,12 @@
+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 8b3dc24776f8a..15142a1505510 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,6 +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.
 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
new file mode 100644
index 0000000000000..fad0b50808aed
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..ee8cd804ecc33
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,12 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..eae445c8285d1
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,12 @@
+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 1db341fb3289c..cf11f6a24a59f 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,6 +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.
 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
new file mode 100644
index 0000000000000..8d058056eeff8
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..8650f643f5fa6
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,13 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..d13aa2bb27c74
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,13 @@
+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 93314504ed7c5..176bf05ba7f5b 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,6 +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.
 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
new file mode 100644
index 0000000000000..138103b44592d
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..01b868c786d50
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
@@ -0,0 +1,17 @@
+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=system).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
new file mode 100644
index 0000000000000..09917c6b0ff74
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
@@ -0,0 +1,17 @@
+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=true,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
new file mode 100644
index 0000000000000..c51743ffe171a
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=amd).types
@@ -23,4 +23,5 @@ 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
new file mode 100644
index 0000000000000..102eafd56a8f3
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=true,module=system).types
@@ -23,4 +23,5 @@ 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
new file mode 100644
index 0000000000000..4275b79ce7fea
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=amd).errors.txt
@@ -0,0 +1,23 @@
+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 8cd41ea7a3e7c..2b80d8f0bc8b2 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 };
 
-//// [tslib.d.ts]
+//// [index.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 adaba14dce798..d0149baffbef5 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 };
 
-//// [tslib.d.ts]
+//// [index.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 ba22069c306f2..a974a5de5cf8f 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 };
 
-//// [tslib.d.ts]
+//// [index.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
new file mode 100644
index 0000000000000..c0c6ac22da1c2
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithLocalCollisions(module=system).errors.txt
@@ -0,0 +1,23 @@
+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 788e5ae4d8d46..2bbe62e910cc9 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 };
 
-//// [tslib.d.ts]
+//// [index.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
new file mode 100644
index 0000000000000..c38af9ccb9190
--- /dev/null
+++ b/tests/baselines/reference/importImportOnlyModule.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 8c43f299b55fd..b1007c7dd329d 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,9 @@
+<<<<<<< HEAD
 error TS2468: Cannot find global value 'Promise'.
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+=======
+error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
@@ -10,8 +15,15 @@ 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'?
 
 
+<<<<<<< HEAD
 !!! error TS2468: Cannot find global value 'Promise'.
 ==== example.ts (2 errors) ====
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== example.ts (1 errors) ====
+=======
+!!! 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) ====
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     // 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 8c43f299b55fd..b1007c7dd329d 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,9 @@
+<<<<<<< HEAD
 error TS2468: Cannot find global value 'Promise'.
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+=======
+error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
@@ -10,8 +15,15 @@ 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'?
 
 
+<<<<<<< HEAD
 !!! error TS2468: Cannot find global value 'Promise'.
 ==== example.ts (2 errors) ====
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== example.ts (1 errors) ====
+=======
+!!! 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) ====
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     // 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
new file mode 100644
index 0000000000000..7f6610011e1d5
--- /dev/null
+++ b/tests/baselines/reference/importMetaNarrowing(module=system).errors.txt
@@ -0,0 +1,11 @@
+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/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index a79371922ac59..8b8ffec2e1ee2 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -19,10 +19,9 @@ var foo;
     foo.answer = 42;
 })(foo || (foo = {}));
 //// [foo_1.js]
-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) {
-    }
-});
+"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) {
+}
diff --git a/tests/baselines/reference/importShadowsGlobalName.errors.txt b/tests/baselines/reference/importShadowsGlobalName.errors.txt
new file mode 100644
index 0000000000000..39f345f4cfefb
--- /dev/null
+++ b/tests/baselines/reference/importShadowsGlobalName.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..8986a26bb0304
--- /dev/null
+++ b/tests/baselines/reference/importTypeAmdBundleRewrite.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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/import_reference-exported-alias.errors.txt b/tests/baselines/reference/import_reference-exported-alias.errors.txt
new file mode 100644
index 0000000000000..83ee7312a7f92
--- /dev/null
+++ b/tests/baselines/reference/import_reference-exported-alias.errors.txt
@@ -0,0 +1,24 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..c2a56c65c3c83
--- /dev/null
+++ b/tests/baselines/reference/import_reference-to-type-alias.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..30e51a1112342
--- /dev/null
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..35aa73efb55f6
--- /dev/null
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..403509739a312
--- /dev/null
+++ b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..1e6002bf6463a
--- /dev/null
+++ b/tests/baselines/reference/importedModuleClassNameClash.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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 f37fab285be1d..607a576ef6061 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -4,7 +4,8 @@
 import foo = m1;
 >foo : typeof foo
 >    : ^^^^^^^^^^
->m1 : error
+>m1 : any
+>   : ^^^
  
 export module m1 { }
  
diff --git a/tests/baselines/reference/importsInAmbientModules1.errors.txt b/tests/baselines/reference/importsInAmbientModules1.errors.txt
new file mode 100644
index 0000000000000..6df82ef0b129b
--- /dev/null
+++ b/tests/baselines/reference/importsInAmbientModules1.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..478f04c3d80d0
--- /dev/null
+++ b/tests/baselines/reference/importsInAmbientModules2.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..2f70e94171482
--- /dev/null
+++ b/tests/baselines/reference/importsInAmbientModules3.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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/instanceOfInExternalModules.errors.txt b/tests/baselines/reference/instanceOfInExternalModules.errors.txt
new file mode 100644
index 0000000000000..e611dcf5b41d2
--- /dev/null
+++ b/tests/baselines/reference/instanceOfInExternalModules.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 1642925bc3d41..4e025843be762 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -10,11 +10,13 @@ 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 5a771a023db97..fada60d350710 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; }
 
 
 //// [interfaceDeclaration3.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -91,3 +92,136 @@ define(["require", "exports"], function (require, exports) {
     class C3 {
     }
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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() {
+        }
+        return C1;
+    }());
+    var C2 = /** @class */ (function () {
+        function C2() {
+        }
+        return C2;
+    }());
+    var C3 = /** @class */ (function () {
+        function C3() {
+        }
+        return C3;
+    }());
+});
+=======
+"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() {
+    }
+    return C1;
+}());
+var C2 = /** @class */ (function () {
+    function C2() {
+    }
+    return C2;
+}());
+var C3 = /** @class */ (function () {
+    function C3() {
+    }
+    return C3;
+}());
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/interfaceDeclaration5.errors.txt b/tests/baselines/reference/interfaceDeclaration5.errors.txt
new file mode 100644
index 0000000000000..186a9195e22f3
--- /dev/null
+++ b/tests/baselines/reference/interfaceDeclaration5.errors.txt
@@ -0,0 +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 '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 ab4c8db7e3c48..5c61f6cfab701 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,6 +27,7 @@ export class Test {
 
 
 //// [interfaceImplementation6.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -47,3 +48,60 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.Test = Test;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
new file mode 100644
index 0000000000000..0e32f6de63ea9
--- /dev/null
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e298ad48de0a9
--- /dev/null
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..87dffa8304ed4
--- /dev/null
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..8fe0f70788ede
--- /dev/null
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a4016a8b13c25
--- /dev/null
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..aa8213b6a2dca
--- /dev/null
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e8c184fc74084
--- /dev/null
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 2c79e4369a26b..e048bd275d78e 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,12 +14,10 @@ export module c {
 var x: c.b;
 
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
-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;
-});
+"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
new file mode 100644
index 0000000000000..8d4452ecab01f
--- /dev/null
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 966f2f1676c46..6e0867ef4095f 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,12 +19,10 @@ export module c {
 export var z: c.b.I;
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
-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 = {}));
-});
+"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
new file mode 100644
index 0000000000000..09fb81b94ad55
--- /dev/null
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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 847e487499192..2dd2e86c9ccfe 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
@@ -27,6 +27,7 @@ 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
new file mode 100644
index 0000000000000..2ba14d11d724b
--- /dev/null
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..afe281be9a989
--- /dev/null
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a634e250de0da
--- /dev/null
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 04835e73eb209..5bf88b00ce72f 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithAMD.errors.txt
@@ -1,9 +1,11 @@
+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/invalidSyntaxNamespaceImportWithSystem.errors.txt b/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
index 04835e73eb209..ca4f0308ec1e7 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithSystem.errors.txt
@@ -1,9 +1,11 @@
+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
new file mode 100644
index 0000000000000..3db3e59dd3df9
--- /dev/null
+++ b/tests/baselines/reference/isolatedDeclarationOutFile.errors.txt
@@ -0,0 +1,24 @@
+error TS5107: Option '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/isolatedModulesPlainFile-AMD.errors.txt b/tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
new file mode 100644
index 0000000000000..446077b024f6d
--- /dev/null
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..39a0a212feeda
--- /dev/null
+++ b/tests/baselines/reference/isolatedModulesPlainFile-System.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..4628c31cb408a
--- /dev/null
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.errors.txt
@@ -0,0 +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.
+
+
+!!! 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/jsDeclarationsImportTypeBundled.errors.txt b/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
new file mode 100644
index 0000000000000..2c8a21b54d7a2
--- /dev/null
+++ b/tests/baselines/reference/jsDeclarationsImportTypeBundled.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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/jsFileCompilationRestParamJsDocFunction.errors.txt b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
new file mode 100644
index 0000000000000..caaae70c3ac3e
--- /dev/null
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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 27985ba64217c..2a91f1f7cc057 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.types
@@ -17,6 +17,7 @@ function apply(func, thisArg, ...args) {
 >func : Function
 >     : ^^^^^^^^
 >thisArg : any
+>        : ^^^
 >args : any[]
 >     : ^^^^^
 
@@ -38,6 +39,7 @@ function apply(func, thisArg, ...args) {
 >0 : 0
 >  : ^
 >func.call(thisArg) : any
+>                   : ^^^
 >func.call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >          : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >func : Function
@@ -45,11 +47,13 @@ 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
@@ -57,7 +61,9 @@ function apply(func, thisArg, ...args) {
 >call : (this: Function, thisArg: any, ...argArray: any[]) => any
 >     : ^    ^^        ^^       ^^   ^^^^^        ^^     ^^^^^   
 >thisArg : any
+>        : ^^^
 >args[0] : any
+>        : ^^^
 >args : any[]
 >     : ^^^^^
 >0 : 0
@@ -67,6 +73,7 @@ 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
@@ -74,12 +81,15 @@ 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
@@ -89,6 +99,7 @@ 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
@@ -96,17 +107,21 @@ 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
@@ -114,6 +129,7 @@ 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
@@ -121,6 +137,7 @@ function apply(func, thisArg, ...args) {
 >apply : (this: Function, thisArg: any, argArray?: any) => any
 >      : ^    ^^        ^^       ^^   ^^        ^^^   ^^^^^   
 >thisArg : any
+>        : ^^^
 >args : any[]
 >     : ^^^^^
 }
diff --git a/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt b/tests/baselines/reference/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt
index 11dd272e65c7f..453fbd038e286 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 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(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 (1 errors) ====
@@ -6,7 +6,7 @@ jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/js
         content = () => (
             <></>
             ~~
-!!! 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 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.
         )
     }
     
\ 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 b9185baa77ec7..7529f71c4d566 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 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(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 (1 errors) ====
@@ -6,7 +6,7 @@ jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/js
         content = () => (
             <></>
             ~~
-!!! 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 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.
         )
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts1.errors.txt b/tests/baselines/reference/keepImportsInDts1.errors.txt
new file mode 100644
index 0000000000000..f97a0bc46f547
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts1.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..5d2e2145509e0
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts2.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..ab575337fb28a
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts3.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..1fc5e4d5f136a
--- /dev/null
+++ b/tests/baselines/reference/keepImportsInDts4.errors.txt
@@ -0,0 +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 '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/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
index c82821c21e508..3f04b2a944f07 100644
--- a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
+++ b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
@@ -1,8 +1,10 @@
+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/libReferenceDeclarationEmitBundle.errors.txt b/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
new file mode 100644
index 0000000000000..35581620421d6
--- /dev/null
+++ b/tests/baselines/reference/libReferenceDeclarationEmitBundle.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..2f82acb2c125b
--- /dev/null
+++ b/tests/baselines/reference/libReferenceNoLibBundle.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ab36e8b411a4a
--- /dev/null
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..cea7df9f75504
--- /dev/null
+++ b/tests/baselines/reference/mergedDeclarations6.errors.txt
@@ -0,0 +1,25 @@
+error TS5107: Option '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 9cc38a99f3dad..5962489ce7a2c 100644
--- a/tests/baselines/reference/mergedDeclarations6.types
+++ b/tests/baselines/reference/mergedDeclarations6.types
@@ -7,20 +7,25 @@ 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/moduleAliasAsFunctionArgument.errors.txt b/tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
new file mode 100644
index 0000000000000..df4a18a2ed0ee
--- /dev/null
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ab7230781a1f1
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.errors.txt
@@ -0,0 +1,35 @@
+error TS5107: Option '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 ad9049c840c54..5cf30422617b6 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
@@ -9,9 +9,11 @@ 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
@@ -29,6 +31,7 @@ declare module "./observable" {
 
     interface I {x0}
 >x0 : any
+>   : ^^^
 }
 
 === map2.ts ===
@@ -40,9 +43,11 @@ 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
@@ -60,6 +65,7 @@ declare module "./observable" {
 
     interface I {x1}
 >x1 : any
+>   : ^^^
 }
 
 
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8.js b/tests/baselines/reference/moduleAugmentationGlobal8.js
index 2b15cca3f095a..6b4db1bd3fdbf 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8.js
@@ -10,7 +10,4 @@ export {}
 
 
 //// [moduleAugmentationGlobal8.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+export {};
diff --git a/tests/baselines/reference/moduleAugmentationGlobal8_1.js b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
index c4de5018bf775..66a7d16991c4d 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal8_1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal8_1.js
@@ -10,7 +10,4 @@ export {}
 
 
 //// [moduleAugmentationGlobal8_1.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+export {};
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
new file mode 100644
index 0000000000000..a45ae85babde3
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
@@ -0,0 +1,57 @@
+error TS5107: Option '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 5af7b27038a40..665aff9a89ab8 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
@@ -15,9 +15,11 @@ 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
@@ -35,9 +37,11 @@ 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
@@ -101,9 +105,11 @@ 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
@@ -121,9 +127,11 @@ 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
new file mode 100644
index 0000000000000..eddd60c92f3de
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
@@ -0,0 +1,45 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..230be8a692bf6
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
@@ -0,0 +1,50 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..bdce32fc03a65
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
@@ -0,0 +1,49 @@
+error TS5107: Option '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/moduleAugmentationsImports4.errors.txt b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
new file mode 100644
index 0000000000000..f2647f4fc4f1c
--- /dev/null
+++ b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
@@ -0,0 +1,50 @@
+error TS5107: Option '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/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index f2d4058514615..d319bbe920bf3 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,6 +16,7 @@ void 0;
 if (!module.exports) module.exports = "";
 
 //// [moduleExports1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -38,3 +39,54 @@ define(["require", "exports"], function (require, exports) {
     if (!module.exports)
         module.exports = "";
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 = "";
+});
+=======
+"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 = "";
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
new file mode 100644
index 0000000000000..582decfe9ccc2
--- /dev/null
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..eb50eb679b69b
--- /dev/null
+++ b/tests/baselines/reference/moduleMergeConstructor.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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/moduleNoneDynamicImport(target=es2015).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
new file mode 100644
index 0000000000000..506f5a57da502
--- /dev/null
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).errors.txt
@@ -0,0 +1,10 @@
+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=es2020).errors.txt b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
new file mode 100644
index 0000000000000..506f5a57da502
--- /dev/null
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2020).errors.txt
@@ -0,0 +1,10 @@
+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 1c79566fe7150..7ff5b8706838c 100644
--- a/tests/baselines/reference/moduleNoneErrors.errors.txt
+++ b/tests/baselines/reference/moduleNoneErrors.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..12037428e5f2a
--- /dev/null
+++ b/tests/baselines/reference/moduleNoneOutFile.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..ed9351bbd350f
--- /dev/null
+++ b/tests/baselines/reference/modulePrologueAMD.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..4c128553e2f44
--- /dev/null
+++ b/tests/baselines/reference/modulePrologueSystem.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..70ed6ce2dd894
--- /dev/null
+++ b/tests/baselines/reference/modulePrologueUmd.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 61a7354cee492..7800c822f4a29 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,4 +5,5 @@
 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 6966f7bd7ddc7..f604a4236ec6d 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,6 +8,7 @@ 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 61962b8246048..f48832a77572b 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,6 +5,7 @@ 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 8ad1ff74f131c..9983eaff2b6ce 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,6 +5,7 @@
 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/moduleResolution_classicPrefersTs.errors.txt b/tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
new file mode 100644
index 0000000000000..15dcc5fb668cf
--- /dev/null
+++ b/tests/baselines/reference/moduleResolution_classicPrefersTs.errors.txt
@@ -0,0 +1,13 @@
+error TS5107: Option '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/nestedRedeclarationInES6AMD.errors.txt b/tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
new file mode 100644
index 0000000000000..d77ca1b616b35
--- /dev/null
+++ b/tests/baselines/reference/nestedRedeclarationInES6AMD.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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/noBundledEmitFromNodeModules.errors.txt b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
index 7af8f8770a0f1..d6f3865e2b2ee 100644
--- a/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
+++ b/tests/baselines/reference/noBundledEmitFromNodeModules.errors.txt
@@ -1,9 +1,11 @@
 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/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
new file mode 100644
index 0000000000000..693651860fc9d
--- /dev/null
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt
@@ -0,0 +1,7 @@
+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 1c7d11cc7fa23..7ad4ea8858b04 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
@@ -1,6 +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.
 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 0a62b57721c02..ba676c872cc92 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
@@ -1,6 +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.
 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 22b673a5b420c..e7b3c26f924dd 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.errors.txt
@@ -1,6 +1,8 @@
 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 ecc0908057d97..c2aa7f00a82e7 100644
--- a/tests/baselines/reference/noImplicitUseStrict_system.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_system.errors.txt
@@ -1,6 +1,8 @@
 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 98e34e0171f66..97189216236cd 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.errors.txt
@@ -1,6 +1,8 @@
 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/objectIndexer.errors.txt b/tests/baselines/reference/objectIndexer.errors.txt
new file mode 100644
index 0000000000000..2095fa771df5b
--- /dev/null
+++ b/tests/baselines/reference/objectIndexer.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option '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 835bfb70fff40..d67c0922f0793 100644
--- a/tests/baselines/reference/objectIndexer.types
+++ b/tests/baselines/reference/objectIndexer.types
@@ -4,6 +4,7 @@
 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
new file mode 100644
index 0000000000000..757436d42452f
--- /dev/null
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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/outFilerootDirModuleNamesSystem.errors.txt b/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
new file mode 100644
index 0000000000000..978901f629afd
--- /dev/null
+++ b/tests/baselines/reference/outFilerootDirModuleNamesSystem.errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..bf1bdc018fc57
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatAmd.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..635a9186a3446
--- /dev/null
+++ b/tests/baselines/reference/outModuleConcatSystem.errors.txt
@@ -0,0 +1,10 @@
+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 c4a744578f784..142e3121e87af 100644
--- a/tests/baselines/reference/outModuleConcatUmd.errors.txt
+++ b/tests/baselines/reference/outModuleConcatUmd.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..743cc840fe165
--- /dev/null
+++ b/tests/baselines/reference/outModuleTripleSlashRefs.errors.txt
@@ -0,0 +1,32 @@
+error TS5107: Option '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 435349fe337d7..3ff1544aade3e 100644
--- a/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt
+++ b/tests/baselines/reference/packageJsonExportsOptionsCompat.errors.txt
@@ -1,12 +1,15 @@
+/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 (3 errors) ====
+==== /tsconfig.json (4 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 5d90d36e485be..bc6129833a4db 100644
--- a/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt
@@ -1,8 +1,10 @@
 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 71451c8ef60dd..cbc48cbb0ad9a 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution1_amd.errors.txt
@@ -1,10 +1,13 @@
+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 (2 errors) ====
+==== c:/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.
             "paths": {
                 "*": [
                     "*",
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
index 3f4b7a24edf25..984cb20e7a2e5 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
@@ -1,10 +1,27 @@
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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(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.
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
 
 
+<<<<<<< HEAD
 ==== root/tsconfig.json (2 errors) ====
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== root/tsconfig.json (3 errors) ====
+=======
+==== root/tsconfig.json (4 errors) ====
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     {
         "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",
             "paths": {
                 "*1*": [ "*2*" ]
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
new file mode 100644
index 0000000000000..954947986d00f
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.errors.txt
@@ -0,0 +1,25 @@
+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;
+    use(x.toExponential());
+    
+==== c:/root/folder2/file2.ts (0 errors) ====
+    import {x as a} from "./file3"  // found with baseurl
+    import {y as b} from "file4"    // found with fallback
+    export var x = a + b;
+    
+==== c:/root/folder2/file3.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/file4.ts (0 errors) ====
+    export var y = 100;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
new file mode 100644
index 0000000000000..e26a99f3bff90
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.errors.txt
@@ -0,0 +1,35 @@
+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) ====
+    {
+        "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
+        }
+    }
+    
+==== c:/root/folder1/file1.ts (0 errors) ====
+    import {x} from "folder2/file2"
+    declare function use(a: any): void;
+    use(x.toExponential());
+    
+==== c:/root/folder2/file2.ts (0 errors) ====
+    import {x as a} from "./file3"  // found with baseurl
+    import {y as b} from "file4"    // found with fallback
+    export var x = a + b;
+    
+==== c:/root/folder2/file3.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/file4.ts (0 errors) ====
+    export var y = 100;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
new file mode 100644
index 0000000000000..21f6617166d4c
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.errors.txt
@@ -0,0 +1,49 @@
+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) ====
+    {
+        "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
+            "paths": {
+                "*": [
+                    "*",
+                    "generated/*"
+                ],
+                    "components/*": [
+                        "shared/components/*"
+                    ]
+            }
+        }
+    }
+==== c:/root/folder1/file1.ts (0 errors) ====
+    import {x} from "folder2/file1"
+    import {y} from "folder3/file2"
+    import {z} from "components/file3"
+    import {z1} from "file4"
+    
+    declare function use(a: any): void;
+    
+    use(x.toExponential());
+    use(y.toExponential());
+    use(z.toExponential());
+    use(z1.toExponential());
+    
+==== c:/root/folder2/file1.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/root/generated/folder3/file2.ts (0 errors) ====
+    export var y = 1;
+    
+==== c:/root/shared/components/file3.ts (0 errors) ====
+    export var z = 1;
+    
+==== c:/file4.ts (0 errors) ====
+    export var z1 = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
new file mode 100644
index 0000000000000..23c68b4af9411
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.errors.txt
@@ -0,0 +1,25 @@
+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 2bdb131bb68b1..ec6e6bf5fc670 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution6_classic.types
@@ -13,6 +13,7 @@ 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
new file mode 100644
index 0000000000000..5508ee7c19e1f
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.errors.txt
@@ -0,0 +1,57 @@
+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) ====
+    {
+        "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
+            "paths": {
+                "*": [
+                    "*",
+                    "c:/shared/*"
+                ],
+                "templates/*": [
+                    "generated/src/templates/*"
+                ]
+            },
+            "rootDirs": [
+                ".",
+                "../generated/src"
+            ]
+        }
+    }
+    
+==== c:/root/src/file1.ts (0 errors) ====
+    import {x} from "./project/file2";
+    import {y} from "module3";
+    
+    declare function use(x: string);
+    use(x.toFixed());
+    use(y.toFixed());
+    
+==== c:/root/src/file3.d.ts (0 errors) ====
+    export let x: number;
+    
+==== c:/root/generated/src/project/file2.ts (0 errors) ====
+    import {a} from "module1";
+    import {b} from "templates/module2";
+    import {x as c} from "../file3";
+    export let x = a + b + c;
+    
+==== c:/shared/module1.d.ts (0 errors) ====
+    export let a: number
+    
+==== c:/root/generated/src/templates/module2.ts (0 errors) ====
+    export let b: number;
+    
+==== c:/module3.d.ts (0 errors) ====
+    export let y: number;
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
new file mode 100644
index 0000000000000..95c012f361034
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_classic.errors.txt
@@ -0,0 +1,31 @@
+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) ====
+    {
+        "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
+            "paths": {
+                "@speedy/*/testing": [
+                   "*/dist/index.ts"
+                ]
+            }
+        }
+    }
+    
+==== c:/root/index.ts (0 errors) ====
+    import {x} from "@speedy/folder1/testing"
+    
+==== c:/root/folder1/dist/index.ts (0 errors) ====
+    export const x = 1 + 2;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
index aed0d9c6b8c59..d120082362e17 100644
--- a/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
+++ b/tests/baselines/reference/prefixUnaryOperatorsOnExportedVariables.errors.txt
@@ -1,6 +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.
 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 6421fbec30524..6ec5a25b34247 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
@@ -1,9 +1,11 @@
 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 6421fbec30524..86cb91cee5af7 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
@@ -1,9 +1,11 @@
 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
new file mode 100644
index 0000000000000..2db8c409f81c0
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..000fe280b9dd0
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..89511809e6112
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7dc06a25ca05d
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e8b11e2d53e4b
--- /dev/null
+++ b/tests/baselines/reference/privacyGetter.errors.txt
@@ -0,0 +1,212 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0a8e3f15038f0
--- /dev/null
+++ b/tests/baselines/reference/privacyGloFunc.errors.txt
@@ -0,0 +1,535 @@
+error TS5107: Option '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 46a8ca6c38256..720918c8accf4 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -34,6 +34,7 @@ export module m1 {
 
         constructor (m1_c3_c1_2: any) {
 >m1_c3_c1_2 : any
+>           : ^^^
         }
 
         private f1_private(m1_c3_f1_arg: C1_public) {
@@ -167,6 +168,7 @@ export module 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
@@ -478,6 +480,7 @@ module m2 {
 
         constructor (m2_c3_c1_2: any) {
 >m2_c3_c1_2 : any
+>           : ^^^
         }
 
         private f1_private(m2_c3_f1_arg: m2_C1_public) {
@@ -611,6 +614,7 @@ module m2 {
 
         constructor (m2_c4_c1_2: any) {
 >m2_c4_c1_2 : any
+>           : ^^^
         }
 
         private f1_private(m2_c4_f1_arg: m2_C1_public) {
@@ -919,6 +923,7 @@ 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
@@ -1051,6 +1056,7 @@ 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
new file mode 100644
index 0000000000000..f4b5c64768dd3
--- /dev/null
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
@@ -0,0 +1,157 @@
+error TS5107: Option '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 1ecaca60d6aa6..eeb5964c4b96c 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 fd0ba91c8aab0..20d5caa569ca6 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,6 +50,7 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -59,7 +60,33 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.c_public = c_public;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -68,21 +95,48 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.c_public = c_public;
 });
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
-define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleImportWithoutExport_require"], function (require, exports, im_private_mi_private, im_private_mu_private, im_private_mi_public) {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
     "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();
+    exports.c_public = void 0;
+    var c_public = /** @class */ (function () {
+        function c_public() {
+        }
+        return c_public;
+    }());
+    exports.c_public = c_public;
 });
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [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();
 
 
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts]
@@ -108,7 +162,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 2d499c0ba7207..a3d75551a39b8 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, 105))
+import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+>im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 5, 107))
 
 // 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 4864e24a2b60f..b6028d861566b 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
new file mode 100644
index 0000000000000..1569b84214a0a
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
@@ -0,0 +1,104 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..39a66f745261a
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
@@ -0,0 +1,104 @@
+error TS5107: Option '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 8b9314cc44bd1..92f3c7e9663d6 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'.
     }
     
-==== tslib.d.ts (0 errors) ====
+==== node_modules/tslib/index.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 1c46c25afa8fe..844aecf231cf1 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; }
 }
 
-//// [tslib.d.ts]
+//// [index.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 e3ba295c724e5..b13f7512037e9 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))
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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(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, --, --))
+>__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))
 
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
->__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, --, --))
+>__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))
 
diff --git a/tests/baselines/reference/privateNameEmitHelpers.types b/tests/baselines/reference/privateNameEmitHelpers.types
index 69f0d4f6a284d..2e7be91970d54 100644
--- a/tests/baselines/reference/privateNameEmitHelpers.types
+++ b/tests/baselines/reference/privateNameEmitHelpers.types
@@ -38,7 +38,7 @@ export class C {
 >  : ^^^^^^
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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 525d1034bf26b..2b2cea73b5092 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'.
     }
     
-==== tslib.d.ts (0 errors) ====
+==== node_modules/tslib/index.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 da1af623fe312..8ed176b162d1c 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(); }
 }
 
-//// [tslib.d.ts]
+//// [index.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 6b1b76dfe9947..681c0bd0efef7 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))
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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(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, --, --))
+>__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))
 
 export declare function __classPrivateFieldSet<T extends object, V>(receiver: T, state: any, value: V): V;
->__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, --, --))
+>__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))
 
diff --git a/tests/baselines/reference/privateNameStaticEmitHelpers.types b/tests/baselines/reference/privateNameStaticEmitHelpers.types
index 2cf321bb0a728..bd4d15344e8e0 100644
--- a/tests/baselines/reference/privateNameStaticEmitHelpers.types
+++ b/tests/baselines/reference/privateNameStaticEmitHelpers.types
@@ -34,7 +34,7 @@ export class S {
 >  : ^^^^^^^^
 }
 
-=== tslib.d.ts ===
+=== node_modules/tslib/index.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
new file mode 100644
index 0000000000000..301401deeeded
--- /dev/null
+++ b/tests/baselines/reference/privatePropertyUsingObjectType.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7a2f702213bb1
--- /dev/null
+++ b/tests/baselines/reference/project/baseline/amd/baseline.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..30ec6e699721c
--- /dev/null
+++ b/tests/baselines/reference/project/baseline/node/baseline.errors.txt
@@ -0,0 +1,12 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..d515b287e96e1
--- /dev/null
+++ b/tests/baselines/reference/project/baseline2/amd/baseline2.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..617a04f2151c7
--- /dev/null
+++ b/tests/baselines/reference/project/baseline2/node/baseline2.errors.txt
@@ -0,0 +1,12 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3590de718d749
--- /dev/null
+++ b/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
@@ -0,0 +1,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.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3fa1f12ca1258
--- /dev/null
+++ b/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
@@ -0,0 +1,11 @@
+error TS5107: Option '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 09e738e27c13d..b9d9e8b2b893e 100644
--- a/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/amd/cantFindTheModule.errors.txt
@@ -1,8 +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.
+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 09e738e27c13d..48a6b2a4975ba 100644
--- a/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
+++ b/tests/baselines/reference/project/cantFindTheModule/node/cantFindTheModule.errors.txt
@@ -1,8 +1,10 @@
+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
new file mode 100644
index 0000000000000..cf15263948181
--- /dev/null
+++ b/tests/baselines/reference/project/circularReferencing/amd/circularReferencing.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..e6f259522ede2
--- /dev/null
+++ b/tests/baselines/reference/project/circularReferencing/node/circularReferencing.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..d699f043eeab4
--- /dev/null
+++ b/tests/baselines/reference/project/circularReferencing2/amd/circularReferencing2.errors.txt
@@ -0,0 +1,30 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..cd945d1f622d7
--- /dev/null
+++ b/tests/baselines/reference/project/circularReferencing2/node/circularReferencing2.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d8c2778d28cf
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/amd/declarationDir.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7595d62dab7a2
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir/node/declarationDir.errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d8c2778d28cf
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/amd/declarationDir2.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7595d62dab7a2
--- /dev/null
+++ b/tests/baselines/reference/project/declarationDir2/node/declarationDir2.errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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 4dfbd076cc92f..fdd4900316bb9 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
@@ -1,7 +1,11 @@
 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 c877782f38964..5ed911b169808 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -1,8 +1,10 @@
 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
new file mode 100644
index 0000000000000..5befa870d86ac
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/declarationsCascadingImports.errors.txt
@@ -0,0 +1,30 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a70585d1ef8fc
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/declarationsCascadingImports.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..833478d927747
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..f6e1a7f7645d0
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..71f7e801d987e
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/declarationsGlobalImport.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..70efa77735aab
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/declarationsGlobalImport.errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5a2867d36b6fe
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..1cab1c03a3e64
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
@@ -0,0 +1,24 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..9c0dcb6ab676b
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/declarationsImportedUseInFunction.errors.txt
@@ -0,0 +1,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.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..800a0933dc5c8
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/declarationsImportedUseInFunction.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f2d98e4b42baa
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/declarationsIndirectImportShouldResultInError.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..2eb82cb61b2e5
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/declarationsIndirectImportShouldResultInError.errors.txt
@@ -0,0 +1,26 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..2e320cff19d44
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
@@ -0,0 +1,35 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..adbf74ce77c1f
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
@@ -0,0 +1,33 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f1d13f19b4505
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..9fd68a4c43ccf
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..1d0efa7d14624
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..d32645887060c
--- /dev/null
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..1ca880ef898ef
--- /dev/null
+++ b/tests/baselines/reference/project/declareExportAdded/amd/declareExportAdded.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..cec554c516db9
--- /dev/null
+++ b/tests/baselines/reference/project/declareExportAdded/node/declareExportAdded.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 73d3a86d014bc..b1f81b629f7d4 100644
--- a/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
+++ b/tests/baselines/reference/project/declareVariableCollision/amd/declareVariableCollision.errors.txt
@@ -1,7 +1,11 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+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 73d3a86d014bc..a2584e6b97c29 100644
--- a/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
+++ b/tests/baselines/reference/project/declareVariableCollision/node/declareVariableCollision.errors.txt
@@ -1,7 +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.
 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
new file mode 100644
index 0000000000000..1a9ede8c45089
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/amd/defaultExcludeNodeModulesAndOutDir.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..c152eb847a1e5
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDir/node/defaultExcludeNodeModulesAndOutDir.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..0994c19e96f40
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..89f9957c19347
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndOutDirWithAllowJS/node/defaultExcludeNodeModulesAndOutDirWithAllowJS.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..c17623171c4b4
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/amd/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..b8ef2bd450e25
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDir/node/defaultExcludeNodeModulesAndRelativePathOutDir.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..33138ca2028ff
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/amd/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..6fae14f105e6b
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS/node/defaultExcludeNodeModulesAndRelativePathOutDirWithAllowJS.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..ef94fccaf8f8b
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/amd/defaultExcludeOnlyNodeModules.errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..593927f1e7d0e
--- /dev/null
+++ b/tests/baselines/reference/project/defaultExcludeOnlyNodeModules/node/defaultExcludeOnlyNodeModules.errors.txt
@@ -0,0 +1,13 @@
+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 e645d251235a1..06a7bb238c97a 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -1,12 +1,18 @@
+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 (0 errors) ====
+==== tsconfig.json (2 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/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
index e645d251235a1..9ced49cce9130 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/emitDecoratorMetadataCommonJSISolatedModules.errors.txt
@@ -1,10 +1,13 @@
+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 (0 errors) ====
+==== tsconfig.json (1 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/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
index 4362efe8f139e..762e07cf1d37d 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -1,12 +1,18 @@
+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 (0 errors) ====
+==== tsconfig.json (2 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/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
index 4362efe8f139e..4f2e4137d9955 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/emitDecoratorMetadataCommonJSISolatedModulesNoResolve.errors.txt
@@ -1,10 +1,13 @@
+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 (0 errors) ====
+==== tsconfig.json (1 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/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
index b8ae506a1ffa4..4c3cba22b2566 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/emitDecoratorMetadataSystemJS.errors.txt
@@ -1,12 +1,18 @@
+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 (0 errors) ====
+==== tsconfig.json (2 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/node/emitDecoratorMetadataSystemJS.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
index b8ae506a1ffa4..1e19b3cfa4c97 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/emitDecoratorMetadataSystemJS.errors.txt
@@ -1,10 +1,13 @@
+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 (0 errors) ====
+==== tsconfig.json (1 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/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
index 05181175f9372..cb44c70831178 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -1,13 +1,19 @@
+tsconfig.json(5,15): 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 (0 errors) ====
+==== tsconfig.json (2 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/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
index 05181175f9372..f2f6708ec1f3e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/emitDecoratorMetadataSystemJSISolatedModules.errors.txt
@@ -1,13 +1,16 @@
+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 (0 errors) ====
+==== tsconfig.json (1 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/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
index 555f6f1a7ccb6..4dd71c2480382 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -1,13 +1,19 @@
+tsconfig.json(5,15): 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 (0 errors) ====
+==== tsconfig.json (2 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/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
index 555f6f1a7ccb6..6f129bfd68837 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/emitDecoratorMetadataSystemJSISolatedModulesNoResolve.errors.txt
@@ -1,13 +1,16 @@
+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 (0 errors) ====
+==== tsconfig.json (1 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/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
new file mode 100644
index 0000000000000..e386dc0900383
--- /dev/null
+++ b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..dcef28814220e
--- /dev/null
+++ b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 5bdeea3038458..14c40e0580669 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/amd/intReferencingExtAndInt.errors.txt
@@ -1,7 +1,11 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+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) ====
     module 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 5bdeea3038458..0e270b2332f7d 100644
--- a/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/intReferencingExtAndInt/node/intReferencingExtAndInt.errors.txt
@@ -1,7 +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.
 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) ====
     module 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 ce9c2a81f90ee..d45c4c02594e3 100644
--- a/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
+++ b/tests/baselines/reference/project/invalidRootFile/amd/invalidRootFile.errors.txt
@@ -1,3 +1,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.
+error 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
@@ -9,6 +11,8 @@ 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 ce9c2a81f90ee..4fcba270f6d00 100644
--- a/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
+++ b/tests/baselines/reference/project/invalidRootFile/node/invalidRootFile.errors.txt
@@ -1,3 +1,4 @@
+error 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
@@ -9,6 +10,7 @@ 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
new file mode 100644
index 0000000000000..3d0b1a53d87a5
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -0,0 +1,15 @@
+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 94920694c0774..7ecee4af6d6cc 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -1,9 +1,12 @@
+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 (1 errors) ====
+==== DifferentNamesNotSpecified/tsconfig.json (2 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
new file mode 100644
index 0000000000000..b40a4ad1bab39
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,20 @@
+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 f6601905979af..454843c1b1547 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -1,9 +1,12 @@
+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 (1 errors) ====
+==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 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 bc59a1a6546c5..e1eb0c3dc70ae 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,15 +1,21 @@
 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 (0 errors) ====
+==== DifferentNamesSpecified/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.
       "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 2a527c77f34d7..29b42d19cdc69 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,6 +1,7 @@
 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.
 
 
@@ -8,9 +9,11 @@ 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 (1 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (2 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
new file mode 100644
index 0000000000000..53ba08a0e8fbb
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,21 @@
+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 5e9b61c196d63..a6a84514ee0a7 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -1,9 +1,12 @@
+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 (1 errors) ====
+==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 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
new file mode 100644
index 0000000000000..8f432f9a92f8c
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/amd/jsFileCompilationSameNameDTsSpecified.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..aeda30adafc6e
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecified/node/jsFileCompilationSameNameDTsSpecified.errors.txt
@@ -0,0 +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 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
new file mode 100644
index 0000000000000..fda0dddeff21a
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000000000..8214bf14d39d6
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDTsSpecifiedWithAllowJs/node/jsFileCompilationSameNameDTsSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..7bab7566c8c99
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/amd/jsFileCompilationSameNameDtsNotSpecified.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..f373c7d74c8d6
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecified/node/jsFileCompilationSameNameDtsNotSpecified.errors.txt
@@ -0,0 +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 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 45cdfd7a3bc42..b704a662fe3b1 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -2,14 +2,20 @@ 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 (0 errors) ====
+==== SameNameDTsNotSpecifiedWithAllowJs/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.
 ==== 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 45cdfd7a3bc42..03de92d63f76d 100644
--- a/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameDtsNotSpecifiedWithAllowJs.errors.txt
@@ -2,14 +2,17 @@ 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 (0 errors) ====
+==== SameNameDTsNotSpecifiedWithAllowJs/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.
 ==== 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
new file mode 100644
index 0000000000000..4633efa5dfbc8
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/amd/jsFileCompilationSameNameFilesNotSpecified.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..2b9b7a6b064be
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecified/node/jsFileCompilationSameNameFilesNotSpecified.errors.txt
@@ -0,0 +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 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
new file mode 100644
index 0000000000000..a928effffd57f
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..f8bb575be7262
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesNotSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000000000..0ab587e1d0ca7
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/amd/jsFileCompilationSameNameFilesSpecified.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..0a3ac10ee871a
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecified/node/jsFileCompilationSameNameFilesSpecified.errors.txt
@@ -0,0 +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 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
new file mode 100644
index 0000000000000..d2ed3a4f3643c
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/amd/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000000000..8c3a5814cb324
--- /dev/null
+++ b/tests/baselines/reference/project/jsFileCompilationSameNameFilesSpecifiedWithAllowJs/node/jsFileCompilationSameNameFilesSpecifiedWithAllowJs.errors.txt
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/mapRootAbsolutePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/mapRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/amd/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderNoOutdir/node/mapRootAbsolutePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/amd/mapRootAbsolutePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleNoOutdir/node/mapRootAbsolutePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputDirectory/node/mapRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/amd/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileNoOutdir/node/mapRootAbsolutePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputDirectory/node/mapRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/amd/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderNoOutdir/node/mapRootAbsolutePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/mapRootRelativePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/mapRootRelativePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/mapRootRelativePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/mapRootRelativePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/amd/mapRootRelativePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderNoOutdir/node/mapRootRelativePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputDirectory/node/mapRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/amd/mapRootRelativePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleNoOutdir/node/mapRootRelativePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/amd/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputDirectory/node/mapRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/amd/mapRootRelativePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileNoOutdir/node/mapRootRelativePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/amd/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputDirectory/node/mapRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/amd/mapRootRelativePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderNoOutdir/node/mapRootRelativePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputDirectory/node/mapRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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 aa02b659d5de9..e7cb96db65bd7 100644
--- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/amd/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,13 @@
 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 aa02b659d5de9..31632130645cc 100644
--- a/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootSourceRootWithNoSourceMapOption/node/mapRootSourceRootWithNoSourceMapOption.errors.txt
@@ -1,9 +1,11 @@
 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 7ad42e1a26d37..4452a4cd37a11 100644
--- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/amd/mapRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,11 @@
 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 7ad42e1a26d37..d38d2c2f6b490 100644
--- a/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/mapRootWithNoSourceMapOption/node/mapRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,9 @@
 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/maprootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/maprootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/maprootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/maprootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/maprootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/amd/maprootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderNoOutdir/node/maprootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/amd/maprootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleNoOutdir/node/maprootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputDirectory/node/maprootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/amd/maprootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileNoOutdir/node/maprootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/amd/maprootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderNoOutdir/node/maprootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/maprootUrlsourcerootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/maprootUrlsourcerootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/amd/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderNoOutdir/node/maprootUrlsourcerootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/amd/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleNoOutdir/node/maprootUrlsourcerootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/amd/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileNoOutdir/node/maprootUrlsourcerootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/amd/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderNoOutdir/node/maprootUrlsourcerootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..8bda4388decac
--- /dev/null
+++ b/tests/baselines/reference/project/moduleIdentifier/amd/moduleIdentifier.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..11eea719c5f2a
--- /dev/null
+++ b/tests/baselines/reference/project/moduleIdentifier/node/moduleIdentifier.errors.txt
@@ -0,0 +1,13 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..d6da6659accad
--- /dev/null
+++ b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..b25a7ac2aa141
--- /dev/null
+++ b/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..31066548247b1
--- /dev/null
+++ b/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..574a78301e6fa
--- /dev/null
+++ b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..dd5fe29148fd6
--- /dev/null
+++ b/tests/baselines/reference/project/multipleLevelsModuleResolution/amd/multipleLevelsModuleResolution.errors.txt
@@ -0,0 +1,43 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7070e3a8d8655
--- /dev/null
+++ b/tests/baselines/reference/project/multipleLevelsModuleResolution/node/multipleLevelsModuleResolution.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..43c30f6649690
--- /dev/null
+++ b/tests/baselines/reference/project/nestedDeclare/amd/nestedDeclare.errors.txt
@@ -0,0 +1,17 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..11092cea6c360
--- /dev/null
+++ b/tests/baselines/reference/project/nestedDeclare/node/nestedDeclare.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 2b17a05139aff..28239b564081c 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/amd/nestedLocalModuleSimpleCase.errors.txt
@@ -1,6 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+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 module 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 2b17a05139aff..dafe89343ee96 100644
--- a/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleSimpleCase/node/nestedLocalModuleSimpleCase.errors.txt
@@ -1,6 +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.
 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 module 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 f42b5a7fc941a..80ace50538b61 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/amd/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,7 +1,11 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+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) ====
     module myModule {
      
diff --git a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
index f42b5a7fc941a..0362eb7d1b4ea 100644
--- a/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
+++ b/tests/baselines/reference/project/nestedLocalModuleWithRecursiveTypecheck/node/nestedLocalModuleWithRecursiveTypecheck.errors.txt
@@ -1,7 +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.
 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) ====
     module myModule {
      
diff --git a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
new file mode 100644
index 0000000000000..9699825d7f176
--- /dev/null
+++ b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..19feb3cc3e42b
--- /dev/null
+++ b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..1e2d30f4ad32a
--- /dev/null
+++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/amd/noProjectOptionAndInputFiles.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..852e30746ec44
--- /dev/null
+++ b/tests/baselines/reference/project/noProjectOptionAndInputFiles/node/noProjectOptionAndInputFiles.errors.txt
@@ -0,0 +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 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/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
index 774e8b8dfdd99..f4722e4d33184 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -1,10 +1,13 @@
+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.
 importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== importHigher/tsconfig.json (1 errors) ====
+==== importHigher/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.
         "allowJs": true,
         "declaration": false,
         "moduleResolution": "node",
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index c31f3e8f802dd..9178559f9020d 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,12 +1,15 @@
+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.
 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 (1 errors) ====
+==== maxDepthExceeded/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=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "allowJs": true,
         "maxNodeModuleJsDepth": 1, // Note: Module m1 is already included as a root file
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
index 7bee0e796e93e..489fa514a91a4 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,11 +1,14 @@
+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.
 maxDepthIncreased/root.ts(7,1): error TS2322: Type 'string' is not assignable to type 'number'.
 
 
-==== maxDepthIncreased/tsconfig.json (1 errors) ====
+==== maxDepthIncreased/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=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
         "allowJs": true,
         "maxNodeModuleJsDepth": 3
diff --git a/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt b/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
new file mode 100644
index 0000000000000..ac559b316d169
--- /dev/null
+++ b/tests/baselines/reference/project/nonRelative/amd/nonRelative.errors.txt
@@ -0,0 +1,35 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..ddb0b1a767bab
--- /dev/null
+++ b/tests/baselines/reference/project/nonRelative/node/nonRelative.errors.txt
@@ -0,0 +1,33 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/outMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/outMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/outModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/outModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/outModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/outModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/outModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/outModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/amd/outMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderNoOutdir/node/outMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/amd/outMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputDirectory/node/outMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/amd/outSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleNoOutdir/node/outSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/amd/outSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputDirectory/node/outSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/amd/outSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileNoOutdir/node/outSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/amd/outSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputDirectory/node/outSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/amd/outSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderNoOutdir/node/outSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/amd/outSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputDirectory/node/outSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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 f644b2a3a90d3..42259d155bd26 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/amd/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,9 +1,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.
+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) ====
     module 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 f644b2a3a90d3..754ae51cd7e6a 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideModule/node/privacyCheckOnImportedModuleDeclarationsInsideModule.errors.txt
@@ -1,9 +1,11 @@
+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) ====
     module 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 61ae9d8331704..9fb8c9173a147 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/amd/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,9 +1,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.
+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 module m1 {
     }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
index 61ae9d8331704..a0c70f7251b83 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule/node/privacyCheckOnImportedModuleDeclarationsInsideNonExportedModule.errors.txt
@@ -1,9 +1,11 @@
+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 module m1 {
     }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
index a454af4a3fed9..98a1863811551 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/amd/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,9 +1,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.
+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 module 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 a454af4a3fed9..fc00fee415508 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleImportStatementInParentModule/node/privacyCheckOnImportedModuleImportStatementInParentModule.errors.txt
@@ -1,9 +1,11 @@
+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 module 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
new file mode 100644
index 0000000000000..acf505d4d9ce9
--- /dev/null
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
@@ -0,0 +1,66 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..9bd26355c3d90
--- /dev/null
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
@@ -0,0 +1,64 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ed5090279fd40
--- /dev/null
+++ b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/amd/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..162f60016b6f7
--- /dev/null
+++ b/tests/baselines/reference/project/privacyCheckOnIndirectTypeFromTheExternalType/node/privacyCheckOnIndirectTypeFromTheExternalType.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..ebfcea0af98dd
--- /dev/null
+++ b/tests/baselines/reference/project/projectOptionTest/amd/projectOptionTest.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..e333a1b225fcf
--- /dev/null
+++ b/tests/baselines/reference/project/projectOptionTest/node/projectOptionTest.errors.txt
@@ -0,0 +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 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
new file mode 100644
index 0000000000000..b8f55915d4f74
--- /dev/null
+++ b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 ef77af7372ee7..be03b9ed0c92f 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a01bffd6f0550
--- /dev/null
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..07a8aa4633c4e
--- /dev/null
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..d7e28101b9377
--- /dev/null
+++ b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..10a5b21a8f645
--- /dev/null
+++ b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
@@ -0,0 +1,13 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..50f26f3c08d6d
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/amd/referenceResolutionRelativePaths.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..265dcf67beaa1
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePaths/node/referenceResolutionRelativePaths.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..bbffbb7d5b757
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/amd/referenceResolutionRelativePathsFromRootDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..033c78f64dc8b
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsFromRootDirectory/node/referenceResolutionRelativePathsFromRootDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..03a77445d9acd
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/amd/referenceResolutionRelativePathsNoResolve.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..72764a5d5c9f7
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsNoResolve/node/referenceResolutionRelativePathsNoResolve.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f647ca73570f7
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/amd/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3340b539e9fa5
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionRelativePathsRelativeToRootDirectory/node/referenceResolutionRelativePathsRelativeToRootDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..45161e39e10e3
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/amd/referenceResolutionSameFileTwice.errors.txt
@@ -0,0 +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.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..5a5b572dc6e22
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwice/node/referenceResolutionSameFileTwice.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..45161e39e10e3
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/amd/referenceResolutionSameFileTwiceNoResolve.errors.txt
@@ -0,0 +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.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..5a5b572dc6e22
--- /dev/null
+++ b/tests/baselines/reference/project/referenceResolutionSameFileTwiceNoResolve/node/referenceResolutionSameFileTwiceNoResolve.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..4061bec552b4e
--- /dev/null
+++ b/tests/baselines/reference/project/relativeGlobal/amd/relativeGlobal.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..9974eddc3def4
--- /dev/null
+++ b/tests/baselines/reference/project/relativeGlobal/node/relativeGlobal.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..67c4e4276445a
--- /dev/null
+++ b/tests/baselines/reference/project/relativeGlobalRef/amd/relativeGlobalRef.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..71989a7a7eed0
--- /dev/null
+++ b/tests/baselines/reference/project/relativeGlobalRef/node/relativeGlobalRef.errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..d7c18c0883041
--- /dev/null
+++ b/tests/baselines/reference/project/relativeNested/amd/relativeNested.errors.txt
@@ -0,0 +1,31 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7999b36424ef5
--- /dev/null
+++ b/tests/baselines/reference/project/relativeNested/node/relativeNested.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e09709f8a2af8
--- /dev/null
+++ b/tests/baselines/reference/project/relativeNestedRef/amd/relativeNestedRef.errors.txt
@@ -0,0 +1,21 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a9dc85ea7d1f2
--- /dev/null
+++ b/tests/baselines/reference/project/relativeNestedRef/node/relativeNestedRef.errors.txt
@@ -0,0 +1,19 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7203056d2abfd
--- /dev/null
+++ b/tests/baselines/reference/project/relativePaths/amd/relativePaths.errors.txt
@@ -0,0 +1,20 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a7246844ddae6
--- /dev/null
+++ b/tests/baselines/reference/project/relativePaths/node/relativePaths.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..9e41c3338fb3c
--- /dev/null
+++ b/tests/baselines/reference/project/rootDirectory/amd/rootDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..1722096680e75
--- /dev/null
+++ b/tests/baselines/reference/project/rootDirectory/node/rootDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 4e3492c206fdb..7a71502a51064 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/amd/rootDirectoryErrors.errors.txt
@@ -1,8 +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.
+error 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 4e3492c206fdb..6bb24b32a7b9d 100644
--- a/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryErrors/node/rootDirectoryErrors.errors.txt
@@ -1,8 +1,10 @@
+error 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
new file mode 100644
index 0000000000000..9e41c3338fb3c
--- /dev/null
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/amd/rootDirectoryWithSourceRoot.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..1722096680e75
--- /dev/null
+++ b/tests/baselines/reference/project/rootDirectoryWithSourceRoot/node/rootDirectoryWithSourceRoot.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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 4e3492c206fdb..7a71502a51064 100644
--- a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/amd/rootDirectoryWithoutOutDir.errors.txt
@@ -1,8 +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.
+error 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 4e3492c206fdb..6bb24b32a7b9d 100644
--- a/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt
+++ b/tests/baselines/reference/project/rootDirectoryWithoutOutDir/node/rootDirectoryWithoutOutDir.errors.txt
@@ -1,8 +1,10 @@
+error 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/sourceRootAbsolutePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/sourceRootAbsolutePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/sourceRootAbsolutePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/sourceRootAbsolutePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/amd/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderNoOutdir/node/sourceRootAbsolutePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory/node/sourceRootAbsolutePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/amd/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleNoOutdir/node/sourceRootAbsolutePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputDirectory/node/sourceRootAbsolutePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/amd/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileNoOutdir/node/sourceRootAbsolutePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/amd/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory/node/sourceRootAbsolutePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/amd/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderNoOutdir/node/sourceRootAbsolutePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory/node/sourceRootAbsolutePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/sourceRootRelativePathMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/sourceRootRelativePathModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/sourceRootRelativePathModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/sourceRootRelativePathModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/amd/sourceRootRelativePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderNoOutdir/node/sourceRootRelativePathMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputDirectory/node/sourceRootRelativePathMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/amd/sourceRootRelativePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleNoOutdir/node/sourceRootRelativePathSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputDirectory/node/sourceRootRelativePathSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/amd/sourceRootRelativePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileNoOutdir/node/sourceRootRelativePathSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/amd/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputDirectory/node/sourceRootRelativePathSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/amd/sourceRootRelativePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderNoOutdir/node/sourceRootRelativePathSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputDirectory/node/sourceRootRelativePathSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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 b79cae049ffa5..04f498acb4492 100644
--- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/amd/sourceRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,11 @@
 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 b79cae049ffa5..686d415edb7bc 100644
--- a/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
+++ b/tests/baselines/reference/project/sourceRootWithNoSourceMapOption/node/sourceRootWithNoSourceMapOption.errors.txt
@@ -1,7 +1,9 @@
 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/sourcemapMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/sourcemapMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/sourcemapModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/sourcemapModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/sourcemapModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/sourcemapModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/sourcemapModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/sourcemapModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/amd/sourcemapMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderNoOutdir/node/sourcemapMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/amd/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputDirectory/node/sourcemapMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/amd/sourcemapSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleNoOutdir/node/sourcemapSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/amd/sourcemapSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputDirectory/node/sourcemapSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/amd/sourcemapSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileNoOutdir/node/sourcemapSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/amd/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputDirectory/node/sourcemapSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/amd/sourcemapSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderNoOutdir/node/sourcemapSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/amd/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputDirectory/node/sourcemapSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/sourcerootUrlMixedSubfolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..6e50d90f13b84
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..a5ca1482b5cd4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 51edf2991adfc..8463ae5b1a4d5 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/sourcerootUrlModuleMultifolderNoOutdir.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4685d61030d8a
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..07a45826b8bd9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,41 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 247f9e4f2f2a1..8d5143f60ad82 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/sourcerootUrlModuleSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..16c4884ea2d8b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/sourcerootUrlModuleSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..3d31526af0a6b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 12592331fb591..2e947050950b0 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/sourcerootUrlModuleSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..c78e96ab66dc4
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..5336de40839f2
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 42154149020d1..bc6455bd40ffe 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/amd/sourcerootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderNoOutdir/node/sourcerootUrlMultifolderNoOutdir.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/amd/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..3c41aa562c69b
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputDirectory/node/sourcerootUrlMultifolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,36 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..7319ec3d03e3d
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,38 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 664beb97bc203..979a434de92b0 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/amd/sourcerootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleNoOutdir/node/sourcerootUrlSimpleNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/amd/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..7c16ec1b548bc
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputDirectory/node/sourcerootUrlSimpleSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..477be2decfcb0
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 53fc18f86c749..7e7a851c111e4 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/amd/sourcerootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileNoOutdir/node/sourcerootUrlSingleFileNoOutdir.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/amd/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..4793d714a6d0f
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputDirectory/node/sourcerootUrlSingleFileSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..0d25528f041b5
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -0,0 +1,16 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 eb358c3b79d38..17a2812a8c151 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/amd/sourcerootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderNoOutdir/node/sourcerootUrlSubfolderNoOutdir.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/amd/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..a599424df40d9
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputDirectory/node/sourcerootUrlSubfolderSpecifyOutputDirectory.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..babb41566a553
--- /dev/null
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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 110e384982030..f174bdb49dd18 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,6 +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 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
new file mode 100644
index 0000000000000..427e3681ec178
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeUsingRelativepath/amd/specifyExcludeUsingRelativepath.errors.txt
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000000000..e24ede6c05610
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeUsingRelativepath/node/specifyExcludeUsingRelativepath.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..26658d309e487
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/amd/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000000000..2439b82b7c5f4
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeUsingRelativepathWithAllowJS/node/specifyExcludeUsingRelativepathWithAllowJS.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..ae52d48bc64d9
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/amd/specifyExcludeWithOutUsingRelativePath.errors.txt
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000000000..423a4e03772e1
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePath/node/specifyExcludeWithOutUsingRelativePath.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..31e94df7ec0e1
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/amd/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000000000..1da1dcec92d07
--- /dev/null
+++ b/tests/baselines/reference/project/specifyExcludeWithOutUsingRelativePathWithAllowJS/node/specifyExcludeWithOutUsingRelativePathWithAllowJS.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..b77acf2ad6542
--- /dev/null
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/visibilityOfTypeUsedAcrossModules.errors.txt
@@ -0,0 +1,39 @@
+error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+
+
+!!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
+!!! 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
new file mode 100644
index 0000000000000..08306b9f63710
--- /dev/null
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/visibilityOfTypeUsedAcrossModules.errors.txt
@@ -0,0 +1,37 @@
+error TS5107: Option '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 88f77a6a2e84e..e4a31039c53ea 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/amd/visibilityOfTypeUsedAcrossModules2.errors.txt
@@ -1,8 +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.
+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 88f77a6a2e84e..c8ace33a22355 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules2/node/visibilityOfTypeUsedAcrossModules2.errors.txt
@@ -1,8 +1,10 @@
+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/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index 351f6af7e52b7..ae1512786d8a4 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -29,6 +29,7 @@ var y: Foo2;
 
 //// [propertyIdentityWithPrivacyMismatch_0.js]
 //// [propertyIdentityWithPrivacyMismatch_1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -41,3 +42,40 @@ define(["require", "exports"], function (require, exports) {
     var y;
     var y;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.errors.txt
index d3e5485b51fbb..5107eac3d64ff 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 8302ef1a51dd5..ad200057d11fd 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -13,19 +13,32 @@ 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]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 6b97575ff1fb4..39da715015343 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 9865b081e8849..888968d2858bd 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 1bed5684d1f93..95c33f6746f5a 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 fcbf2c278b3b5..5c66c033a1acf 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -17,19 +17,32 @@ 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]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 471cf999a06da..54bd6aae65b8f 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 649acc81d37d0..655c5c1f566f7 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 659de7630fb63..ce36cbc17ff0c 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 303a862470e8f..042f042401b6c 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -21,19 +21,32 @@ 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]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 1324169d71890..919869325088f 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 ced2bff504fe3..bab5c22a5f4b3 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 6097f6a4dffe7..2dfcb34389528 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 687b53954c66c..54cdef2643325 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,25 +9,37 @@ 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]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType4_moduleC"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 57b1068aa42c5..be2c5d433ab69 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, 81))
+import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83))
 
 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, 81))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83))
 
 === 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 a3abe4607859f..512d9aaff9111 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 2a748792f3933..abba655a10667 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 156caac1af4ae..0fd97a6b80c88 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,30 +13,41 @@ 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]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleC"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType5_moduleD"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 8382e50c9b68e..45145f3995770 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, 81))
+import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83))
 
 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, 81))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83))
 
 === 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 5ec0db9227124..93a14f8b6870d 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 242e633456ccd..60e523cad3e2c 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 1b14cd77be1ef..c591291cb7a0b 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,35 +17,45 @@ 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]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleC"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleE"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType6_moduleD"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 ea40f8b5c0e38..55f08c902157b 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, 81))
+import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83))
 
 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, 81))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83))
 
 === 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 f525b59a903ff..c3bb9d576c077 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 b439dc8962b49..c53c278a53508 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,36 +18,46 @@ 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]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleC"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleD.js]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleE"], function (require, exports, self) {
-    "use strict";
-    return self;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE");
+module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleC.js]
-define(["require", "exports", "recursiveExportAssignmentAndFindAliasedType7_moduleD"], function (require, exports, self) {
-    "use strict";
-    var selfVar = self;
-    return selfVar;
-});
+"use strict";
+var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
+var selfVar = self;
+module.exports = selfVar;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     class ClassB {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    var ClassB = /** @class */ (function () {
+        function ClassB() {
+        }
+        return ClassB;
+    }());
+=======
+"use strict";
+var ClassB = /** @class */ (function () {
+    function ClassB() {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
     return ClassB;
-});
+}());
+module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.b = void 0;
-});
+"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 6cbe4cff5e4d1..e9095b64c9f2b 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, 81))
+import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB");
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83))
 
 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, 81))
+>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83))
 
 === 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 9b93f1a1db073..bbb23bb2e04de 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/reexportMissingDefault5.errors.txt b/tests/baselines/reference/reexportMissingDefault5.errors.txt
new file mode 100644
index 0000000000000..140fa902578db
--- /dev/null
+++ b/tests/baselines/reference/reexportMissingDefault5.errors.txt
@@ -0,0 +1,11 @@
+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/relativeNamesInClassicResolution.errors.txt b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
index 851c7894b6a92..99bdcce1c7099 100644
--- a/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
+++ b/tests/baselines/reference/relativeNamesInClassicResolution.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..61d4d95b60bdd
--- /dev/null
+++ b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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/requireEmitSemicolon.errors.txt b/tests/baselines/reference/requireEmitSemicolon.errors.txt
new file mode 100644
index 0000000000000..ee48ee9b36f1a
--- /dev/null
+++ b/tests/baselines/reference/requireEmitSemicolon.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 7519e14cf86f9..a9e01c4345e31 100644
--- a/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithAmd.errors.txt
@@ -1,8 +1,10 @@
 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 db18d33c600a2..44d3758ebc6b6 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
@@ -1,8 +1,10 @@
 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 b751a1a3ab69d..8c407e1b674c1 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmd.errors.txt
@@ -1,7 +1,9 @@
 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 b751a1a3ab69d..8c407e1b674c1 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitAmdOutFile.errors.txt
@@ -1,7 +1,9 @@
 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 2d750ddc6fcc5..1f804dd8bace3 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
@@ -1,10 +1,12 @@
 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 cd0affe7ce19f..89b01a4b0a7a9 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitSystem.errors.txt
@@ -1,9 +1,11 @@
 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 cd0affe7ce19f..57dd7db1aa6a2 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitUmd.errors.txt
@@ -1,9 +1,11 @@
 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 f7596129d6f40..7de26d273b827 100644
--- a/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/resolutionModeImportType1(moduleresolution=classic).errors.txt
@@ -1,6 +1,7 @@
 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?
@@ -9,6 +10,7 @@ error TS2688: Cannot find type definition file for 'foo'.
 !!! 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 8e52a8e3c12ce..a5ade620990a9 100644
--- a/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt
+++ b/tests/baselines/reference/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt
@@ -1,6 +1,7 @@
 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?
@@ -9,6 +10,7 @@ error TS2688: Cannot find type definition file for 'foo'.
 !!! 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/reuseProgramStructure/change-affects-imports.js b/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
index 251ecd5076213..d6411da68b7a8 100644
--- a/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
+++ b/tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
@@ -48,13 +48,25 @@ File: c.ts
 import x from 'b'
 var z = 1;
 resolvedModules:
-b: {
-  "resolvedModule": {
-    "resolvedFileName": "/b.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 File: b.ts
@@ -92,6 +104,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 TS2306: File 'b.ts' is not a module.
+c.ts(2,15): error TS2307: Cannot find module 'b' or its corresponding type declarations.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js b/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
index d6272a55f03a5..a998492bc9dd8 100644
--- a/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
+++ b/tests/baselines/reference/reuseProgramStructure/resolution-cache-follows-imports.js
@@ -1,21 +1,28 @@
 Program 1 Reused:: Not
-File: /b.ts
-
-
-var y = 2
-
 File: a.ts
 
 import {_} from 'b'
 var x = 1
 resolvedModules:
-b: {
-  "resolvedModule": {
-    "resolvedFileName": "/b.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -23,28 +30,35 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
-a.ts(2,17): error TS2306: File '/b.ts' is not a module.
+a.ts(2,17): error TS2307: Cannot find module 'b' or its corresponding type declarations.
 
 
 
 Program 2 Reused:: Completely
-File: /b.ts
-
-
-var y = 2
-
 File: a.ts
 
 import {_} from 'b'
 var x = 2
 resolvedModules:
-b: {
-  "resolvedModule": {
-    "resolvedFileName": "/b.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -52,7 +66,7 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
-a.ts(2,17): error TS2306: File '/b.ts' is not a module.
+a.ts(2,17): error TS2307: Cannot find module 'b' or its corresponding type declarations.
 
 
 
@@ -71,11 +85,6 @@ MissingPaths:: [
 
 
 Program 4 Reused:: SafeModules
-File: /b.ts
-
-
-var y = 2
-
 File: a.ts
 
 import x from 'b'
@@ -83,24 +92,44 @@ import x from 'b'
                 
 var x = 2
 resolvedModules:
-b: {
-  "resolvedModule": {
-    "resolvedFileName": "/b.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
-c: {
+c: esnext: {
   "failedLookupLocations": [
-    "/c.ts",
-    "/c.tsx",
-    "/c.d.ts",
+    "/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",
     "/node_modules/@types/c/package.json",
     "/node_modules/@types/c.d.ts",
     "/node_modules/@types/c/index.d.ts",
-    "/c.js",
-    "/c.jsx"
+    "/node_modules/c/package.json",
+    "/node_modules/c.js",
+    "/node_modules/c.jsx",
+    "/node_modules/c/index.js",
+    "/node_modules/c/index.jsx"
   ]
 }
 
@@ -109,7 +138,7 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
-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?
+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.
 
 
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 f41d87ee9bfa7..093bded1bfa2b 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,13 +4,92 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";
 resolvedModules:
-a: {
-  "resolvedModule": {
-    "resolvedFileName": "/home/src/workspaces/project/a.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -18,6 +97,7 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
+home/src/workspaces/project/a.ts(3,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
 
@@ -27,13 +107,92 @@ File: /home/src/workspaces/project/a.ts
 
 import * as aa from "a";
 resolvedModules:
-a: {
-  "resolvedModule": {
-    "resolvedFileName": "/home/src/workspaces/project/a.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -41,5 +200,6 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
+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 ce5b479d830d8..7b89cc50dc2a1 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,64 +4,120 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 
 resolvedModules:
-fs: {
+fs: esnext: {
   "failedLookupLocations": [
-    "/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/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/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/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"
+    "/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"
   ]
 }
 
@@ -71,64 +127,123 @@ 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 '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.
+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.
 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.
-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.
+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.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: [
@@ -144,64 +259,120 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 var x = 1;
 resolvedModules:
-fs: {
+fs: esnext: {
   "failedLookupLocations": [
-    "/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/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/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/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"
+    "/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"
   ]
 }
 
@@ -211,64 +382,123 @@ 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 '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.
+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.
 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.
-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.
+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.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: [
@@ -284,64 +514,120 @@ File: /home/src/workspaces/project/a/b/app.ts
 import * as fs from 'fs'
 var y = 1;
 resolvedModules:
-fs: {
+fs: esnext: {
   "failedLookupLocations": [
-    "/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/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/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/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"
+    "/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"
   ]
 }
 
@@ -351,70 +637,129 @@ 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 '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.
+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.
 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.
-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.
+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.
 ======== Module name 'fs' was not resolved. ========
 
 MissingPaths:: [
   "lib.d.ts"
 ]
 
-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?
+home/src/workspaces/project/a/b/app.ts(2,21): error TS2307: Cannot find module 'fs' or its corresponding type declarations.
 
 
diff --git a/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js b/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
index daf92414ce3c3..ad211675c5bed 100644
--- a/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
+++ b/tests/baselines/reference/reuseProgramStructure/works-with-updated-SourceFiles.js
@@ -4,13 +4,92 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";a;
 resolvedModules:
-a: {
-  "resolvedModule": {
-    "resolvedFileName": "/home/src/workspaces/project/a.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -18,6 +97,7 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
+home/src/workspaces/project/a.ts(3,20): error TS2307: Cannot find module 'a' or its corresponding type declarations.
 
 
 
@@ -28,13 +108,92 @@ File: /home/src/workspaces/project/a.ts
 
 import * as a from "a";a;
 resolvedModules:
-a: {
-  "resolvedModule": {
-    "resolvedFileName": "/home/src/workspaces/project/a.ts",
-    "extension": ".ts",
-    "isExternalLibraryImport": false,
-    "resolvedUsingTsExtension": false
-  }
+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"
+  ]
 }
 
 
@@ -42,6 +201,7 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
+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
new file mode 100644
index 0000000000000..fc020f78f7316
--- /dev/null
+++ b/tests/baselines/reference/scopedPackagesClassic.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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/shorthand-property-es5-es6.errors.txt b/tests/baselines/reference/shorthand-property-es5-es6.errors.txt
index d34857c693186..5ce21bfdd8af2 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 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,19): error TS2307: Cannot find module './foo' or its corresponding type declarations.
 
 
 ==== test.ts (1 errors) ====
     import {foo} from './foo';
                       ~~~~~~~
-!!! 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 TS2307: Cannot find module './foo' or its corresponding type declarations.
     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 d34857c693186..b35916f415fb3 100644
--- a/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
+++ b/tests/baselines/reference/shorthand-property-es6-amd.errors.txt
@@ -1,6 +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.
 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 d34857c693186..5ce21bfdd8af2 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 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,19): error TS2307: Cannot find module './foo' or its corresponding type declarations.
 
 
 ==== test.ts (1 errors) ====
     import {foo} from './foo';
                       ~~~~~~~
-!!! 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 TS2307: Cannot find module './foo' or its corresponding type declarations.
     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
new file mode 100644
index 0000000000000..b0d75117e07c5
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.errors.txt
@@ -0,0 +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 '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 7b63b2dff88be..e8e3e719bdc56 100644
--- a/tests/baselines/reference/sourceMapValidationExportAssignment.types
+++ b/tests/baselines/reference/sourceMapValidationExportAssignment.types
@@ -7,6 +7,7 @@ class a {
 
     public c;
 >c : any
+>  : ^^^
 }
 export = a;
 >a : a
diff --git a/tests/baselines/reference/staticInstanceResolution5.errors.txt b/tests/baselines/reference/staticInstanceResolution5.errors.txt
index 296f8ade299fe..d44a6f4221e75 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 b892e450f7715..19ad2c241b432 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,6 +17,7 @@ function z(w3: WinJS) { }
 
 
 //// [staticInstanceResolution5_0.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -28,7 +29,37 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.Promise = Promise;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"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;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [staticInstanceResolution5_1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -37,3 +68,20 @@ define(["require", "exports"], function (require, exports) {
     var y = function (w2) { };
     function z(w3) { }
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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) { }
+});
+=======
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// these 3 should be errors
+var x = function (w1) { };
+var y = function (w2) { };
+function z(w3) { }
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/staticInstanceResolution5.symbols b/tests/baselines/reference/staticInstanceResolution5.symbols
index 9d178615f6a36..60e199749224e 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 b61028cde79de..e3221b6b7161a 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 9c6385f8461b0..e1b1be31e6546 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 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(2,26): error TS2307: Cannot find module './1' or its corresponding type declarations.
 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 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,30): error TS2307: Cannot find module './1' or its corresponding type declarations.
 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 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,20): error TS2307: Cannot find module './1' or its corresponding type declarations.
 
 
 ==== strictModeWordInImportDeclaration.ts (6 errors) ====
@@ -12,14 +12,14 @@ strictModeWordInImportDeclaration.ts(4,20): error TS2792: Cannot find module './
                 ~~~~~~~
 !!! error TS1214: Identifier expected. 'package' is a reserved word in strict mode. Modules are automatically in strict mode.
                              ~~~~~
-!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
     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 TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
     import public from "./1"
            ~~~~~~
 !!! error TS1214: Identifier expected. 'public' is a reserved word in strict mode. Modules are automatically in strict mode.
                        ~~~~~
-!!! 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
+!!! error TS2307: Cannot find module './1' or its corresponding type declarations.
\ No newline at end of file
diff --git a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
index 1cb7bc88fe9c6..7f53b98d95bff 100644
--- a/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
+++ b/tests/baselines/reference/syntheticDefaultExportsWithDynamicImports.errors.txt
@@ -1,9 +1,11 @@
 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
new file mode 100644
index 0000000000000..fdb0c2a28e904
--- /dev/null
+++ b/tests/baselines/reference/systemDefaultExportCommentValidity.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d20d06e87a1d1
--- /dev/null
+++ b/tests/baselines/reference/systemDefaultImportCallable.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..e395bb6ce9566
--- /dev/null
+++ b/tests/baselines/reference/systemExportAssignment.errors.txt
@@ -0,0 +1,11 @@
+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 bc47a9626aeaa..b9a7639bdf430 100644
--- a/tests/baselines/reference/systemExportAssignment2.errors.txt
+++ b/tests/baselines/reference/systemExportAssignment2.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..1cba25055d5a6
--- /dev/null
+++ b/tests/baselines/reference/systemExportAssignment3.errors.txt
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000000..de456a5e717c6
--- /dev/null
+++ b/tests/baselines/reference/systemJsForInNoException.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 ad8e11ca9c644..002f00aaffeaf 100644
--- a/tests/baselines/reference/systemJsForInNoException.types
+++ b/tests/baselines/reference/systemJsForInNoException.types
@@ -26,7 +26,8 @@ for (var key in obj)
 >        : ^^^^^^^
 >log : (...data: any[]) => void
 >    : ^^^^    ^^     ^^^^^    
->obj[key] : error
+>obj[key] : any
+>         : ^^^
 >obj : { a: number; }
 >    : ^^^^^^^^^^^^^^
 >key : string
diff --git a/tests/baselines/reference/systemModule1.errors.txt b/tests/baselines/reference/systemModule1.errors.txt
new file mode 100644
index 0000000000000..e71f88a863151
--- /dev/null
+++ b/tests/baselines/reference/systemModule1.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 54c0ec5d7492a..7d61e7e751ed4 100644
--- a/tests/baselines/reference/systemModule10.errors.txt
+++ b/tests/baselines/reference/systemModule10.errors.txt
@@ -1,7 +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.
 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 e5d2e568ab9af..74d1e205ec46c 100644
--- a/tests/baselines/reference/systemModule10_ES5.errors.txt
+++ b/tests/baselines/reference/systemModule10_ES5.errors.txt
@@ -1,7 +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.
 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 9b7de8157beb4..5266c7cac0c3b 100644
--- a/tests/baselines/reference/systemModule11.errors.txt
+++ b/tests/baselines/reference/systemModule11.errors.txt
@@ -1,3 +1,4 @@
+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?
@@ -6,6 +7,7 @@ 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 f841e1dc9b0bb..86a8b181d1660 100644
--- a/tests/baselines/reference/systemModule12.errors.txt
+++ b/tests/baselines/reference/systemModule12.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..6f51819127913
--- /dev/null
+++ b/tests/baselines/reference/systemModule13.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 9e68e02c4158e..87a6c046415e8 100644
--- a/tests/baselines/reference/systemModule14.errors.txt
+++ b/tests/baselines/reference/systemModule14.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..a22b09ee6fb07
--- /dev/null
+++ b/tests/baselines/reference/systemModule15.errors.txt
@@ -0,0 +1,31 @@
+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 a648d1aacc58d..e26a11f1e8bef 100644
--- a/tests/baselines/reference/systemModule15.types
+++ b/tests/baselines/reference/systemModule15.types
@@ -9,6 +9,7 @@ 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 cda21993deb8f..99c99fd90e087 100644
--- a/tests/baselines/reference/systemModule16.errors.txt
+++ b/tests/baselines/reference/systemModule16.errors.txt
@@ -1,3 +1,4 @@
+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?
@@ -10,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..28f5dc8fbadb9
--- /dev/null
+++ b/tests/baselines/reference/systemModule17.errors.txt
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 0000000000000..ec1246650c923
--- /dev/null
+++ b/tests/baselines/reference/systemModule18.errors.txt
@@ -0,0 +1,12 @@
+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 c1ef2a8bab696..a860f4ab1278c 100644
--- a/tests/baselines/reference/systemModule2.errors.txt
+++ b/tests/baselines/reference/systemModule2.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..ecb71076cde52
--- /dev/null
+++ b/tests/baselines/reference/systemModule3.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..b2b6905abca14
--- /dev/null
+++ b/tests/baselines/reference/systemModule4.errors.txt
@@ -0,0 +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 '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 47145bb374727..e029d2ca8449a 100644
--- a/tests/baselines/reference/systemModule4.types
+++ b/tests/baselines/reference/systemModule4.types
@@ -9,4 +9,5 @@ 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
new file mode 100644
index 0000000000000..773df3c2216cf
--- /dev/null
+++ b/tests/baselines/reference/systemModule5.errors.txt
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..ebdac668ca854
--- /dev/null
+++ b/tests/baselines/reference/systemModule6.errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..c77618db5038e
--- /dev/null
+++ b/tests/baselines/reference/systemModule7.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..7c3d9634a2917
--- /dev/null
+++ b/tests/baselines/reference/systemModule8.errors.txt
@@ -0,0 +1,34 @@
+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 f6582cdf6c999..666f87c14d198 100644
--- a/tests/baselines/reference/systemModule8.types
+++ b/tests/baselines/reference/systemModule8.types
@@ -3,11 +3,13 @@
 === systemModule8.ts ===
 export var x;
 >x : any
+>  : ^^^
 
 x = 1;
 >x = 1 : 1
 >      : ^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -15,25 +17,31 @@ 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
 >  : ^
 
@@ -41,6 +49,7 @@ x -= 1;
 >x -= 1 : number
 >       : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -48,6 +57,7 @@ x *= 1;
 >x *= 1 : number
 >       : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -55,6 +65,7 @@ x /= 1;
 >x /= 1 : number
 >       : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -62,6 +73,7 @@ x |= 1;
 >x |= 1 : number
 >       : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -69,12 +81,15 @@ x &= 1;
 >x &= 1 : number
 >       : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
 x + 1;
 >x + 1 : any
+>      : ^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -82,6 +97,7 @@ x - 1;
 >x - 1 : number
 >      : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -89,6 +105,7 @@ x & 1;
 >x & 1 : number
 >      : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -96,6 +113,7 @@ x | 1;
 >x | 1 : number
 >      : ^^^^^^
 >x : any
+>  : ^^^
 >1 : 1
 >  : ^
 
@@ -103,41 +121,49 @@ 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
@@ -153,6 +179,7 @@ function foo() {
 >x = 100 : 100
 >        : ^^^
 >x : any
+>  : ^^^
 >100 : 100
 >    : ^^^
 }
@@ -195,6 +222,7 @@ 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 be5991350e5de..7ae4b13541fca 100644
--- a/tests/baselines/reference/systemModule9.errors.txt
+++ b/tests/baselines/reference/systemModule9.errors.txt
@@ -1,3 +1,4 @@
+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?
@@ -6,7 +7,14 @@ 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?
 
 
+<<<<<<< HEAD
 ==== systemModule9.ts (6 errors) ====
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== systemModule9.ts (7 errors) ====
+=======
+!!! 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) ====
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     import * as ns from 'file1';
                         ~~~~~~~
 !!! error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt b/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
new file mode 100644
index 0000000000000..60c3e39b47409
--- /dev/null
+++ b/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000000000..44711f0c3ffdc
--- /dev/null
+++ b/tests/baselines/reference/systemModuleConstEnums.errors.txt
@@ -0,0 +1,16 @@
+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 56d1f19b1e2de..5c81a34b24f23 100644
--- a/tests/baselines/reference/systemModuleConstEnums.types
+++ b/tests/baselines/reference/systemModuleConstEnums.types
@@ -5,6 +5,7 @@ declare function use(a: any);
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >a : any
+>  : ^^^
 
 const enum TopLevelConstEnum { X }
 >TopLevelConstEnum : TopLevelConstEnum
@@ -18,6 +19,7 @@ export function foo() {
 
     use(TopLevelConstEnum.X);
 >use(TopLevelConstEnum.X) : any
+>                         : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >TopLevelConstEnum.X : TopLevelConstEnum
@@ -29,6 +31,7 @@ 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
new file mode 100644
index 0000000000000..2797a6292c8f1
--- /dev/null
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
@@ -0,0 +1,16 @@
+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 89c2edb8e0e8b..4c915efbf94a9 100644
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.types
@@ -5,6 +5,7 @@ declare function use(a: any);
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >a : any
+>  : ^^^
 
 const enum TopLevelConstEnum { X }
 >TopLevelConstEnum : TopLevelConstEnum
@@ -18,6 +19,7 @@ export function foo() {
 
     use(TopLevelConstEnum.X);
 >use(TopLevelConstEnum.X) : any
+>                         : ^^^
 >use : (a: any) => any
 >    : ^ ^^   ^^^^^^^^
 >TopLevelConstEnum.X : TopLevelConstEnum
@@ -29,6 +31,7 @@ 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
new file mode 100644
index 0000000000000..17b0e359a5544
--- /dev/null
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
@@ -0,0 +1,13 @@
+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 607f30b28f75a..7e450adda6611 100644
--- a/tests/baselines/reference/systemModuleDeclarationMerging.types
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.types
@@ -9,6 +9,7 @@ export module F { var x; }
 >F : typeof F
 >  : ^^^^^^^^
 >x : any
+>  : ^^^
 
 export class C {}
 >C : C
@@ -18,6 +19,7 @@ export module C { var x; }
 >C : typeof C
 >  : ^^^^^^^^
 >x : any
+>  : ^^^
 
 export enum E {}
 >E : E
@@ -27,4 +29,5 @@ export module E { var x; }
 >E : typeof E
 >  : ^^^^^^^^
 >x : any
+>  : ^^^
 
diff --git a/tests/baselines/reference/systemModuleExportDefault.errors.txt b/tests/baselines/reference/systemModuleExportDefault.errors.txt
new file mode 100644
index 0000000000000..900523915e198
--- /dev/null
+++ b/tests/baselines/reference/systemModuleExportDefault.errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..9e8539c276faa
--- /dev/null
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
@@ -0,0 +1,16 @@
+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 4e87b84df2ec9..4247d85b9e1d1 100644
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.types
@@ -9,6 +9,7 @@ export module TopLevelModule {var v;}
 >TopLevelModule : typeof TopLevelModule
 >               : ^^^^^^^^^^^^^^^^^^^^^
 >v : any
+>  : ^^^
 
 export function TopLevelFunction(): void {}
 >TopLevelFunction : () => void
@@ -32,6 +33,7 @@ export module 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
new file mode 100644
index 0000000000000..ca92612515804
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTargetES6.errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..ee1484af56df8
--- /dev/null
+++ b/tests/baselines/reference/systemModuleTrailingComments.errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..2a624a94c08cc
--- /dev/null
+++ b/tests/baselines/reference/systemModuleWithSuperClass.errors.txt
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000000000..efdaea0144895
--- /dev/null
+++ b/tests/baselines/reference/systemNamespaceAliasEmit.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..422691700e60f
--- /dev/null
+++ b/tests/baselines/reference/systemObjectShorthandRename.errors.txt
@@ -0,0 +1,14 @@
+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 21c68b1837718..3309692a85958 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,8 +1,10 @@
+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
new file mode 100644
index 0000000000000..ef1cdd0171809
--- /dev/null
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).errors.txt
@@ -0,0 +1,83 @@
+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 f2a9992f6d32d..ac622b31610ca 100644
--- a/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
+++ b/tests/baselines/reference/topLevelAwait.1(module=system,target=es2017).types
@@ -195,11 +195,15 @@ 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 e21888aa30a33..c332d24bd00a9 100644
--- a/tests/baselines/reference/topLevelAwaitErrors.11.js
+++ b/tests/baselines/reference/topLevelAwaitErrors.11.js
@@ -11,22 +11,9 @@ export { _await as await };
 
 
 //// [other.js]
-System.register([], function (exports_1, context_1) {
-    "use strict";
-    var __moduleName = context_1 && context_1.id;
-    return {
-        setters: [],
-        execute: function () {
-        }
-    };
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.await = void 0;
 //// [index.js]
-System.register([], function (exports_1, context_1) {
-    "use strict";
-    var __moduleName = context_1 && context_1.id;
-    return {
-        setters: [],
-        execute: function () {
-        }
-    };
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/topLevelExports.errors.txt b/tests/baselines/reference/topLevelExports.errors.txt
new file mode 100644
index 0000000000000..52b401fa9fbb9
--- /dev/null
+++ b/tests/baselines/reference/topLevelExports.errors.txt
@@ -0,0 +1,10 @@
+error TS5107: Option '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 9c6ff7cf295b0..0c12881929ba4 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -4,6 +4,7 @@
 export var x = () => this.window;
 
 //// [topLevelLambda4.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -11,3 +12,16 @@ define(["require", "exports"], function (require, exports) {
     var x = () => this.window;
     exports.x = x;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+var _this = this;
+export var x = function () { return _this.window; };
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt b/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
new file mode 100644
index 0000000000000..355957835b458
--- /dev/null
+++ b/tests/baselines/reference/topLevelVarHoistingSystem.errors.txt
@@ -0,0 +1,14 @@
+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/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 a4a90872e759e..7c55940f84b68 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,6 +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.
 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: 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.
 ==== file.ts (0 errors) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
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 a4a90872e759e..7c55940f84b68 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,6 +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.
 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: 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.
 ==== file.ts (0 errors) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ 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
new file mode 100644
index 0000000000000..b37ebfefd282d
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates module output.errors.txt	
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..b37ebfefd282d
--- /dev/null
+++ b/tests/baselines/reference/transpile/Generates module output.oldTranspile.errors.txt	
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..8d9b3dec5bd51
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.errors.txt	
@@ -0,0 +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 '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
new file mode 100644
index 0000000000000..d44d2a643ba0a
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - System.errors.txt	
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c516802c09bd7
--- /dev/null
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.errors.txt	
@@ -0,0 +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.
+
+
+!!! 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 363afda18581b..1accaccbefd35 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: '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'.
+!!! error TS6046: Argument for '--module' option must be: 'commonjs', '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 363afda18581b..1accaccbefd35 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: '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'.
+!!! error TS6046: Argument for '--module' option must be: 'commonjs', '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 363afda18581b..1accaccbefd35 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: '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'.
+!!! error TS6046: Argument for '--module' option must be: 'commonjs', '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 363afda18581b..1accaccbefd35 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: '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'.
+!!! error TS6046: Argument for '--module' option must be: 'commonjs', '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
new file mode 100644
index 0000000000000..28fdb1e333a68
--- /dev/null
+++ b/tests/baselines/reference/transpile/Sets module name.errors.txt	
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..28fdb1e333a68
--- /dev/null
+++ b/tests/baselines/reference/transpile/Sets module name.oldTranspile.errors.txt	
@@ -0,0 +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.
+
+
+!!! 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 fa90622edb2d4..89a19e081adfb 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
@@ -83,10 +83,23 @@ 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]
@@ -124,7 +137,13 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -165,10 +184,38 @@ 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",
+<<<<<<< HEAD
   "size": 1112
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1072
+=======
+  "size": 1113
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -195,7 +242,13 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -230,10 +283,34 @@ 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",
+<<<<<<< HEAD
   "size": 1162
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1122
+=======
+  "size": 1161
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
@@ -596,7 +673,7 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: incremental-declaration-doesnt-change
 
@@ -611,13 +688,26 @@ Output::
     * lib/tsconfig.json
     * app/tsconfig.json
 
-[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] 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] Building project '/home/src/workspaces/soltion/lib/tsconfig.json'...
 
-[HH:MM:SS AM] Project 'app/tsconfig.json' is up to date with .d.ts files from its dependencies
+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] Updating output timestamps of project '/home/src/workspaces/soltion/app/tsconfig.json'...
+Found 2 errors.
 
 
 
@@ -644,7 +734,13 @@ const globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -685,13 +781,40 @@ 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",
+<<<<<<< HEAD
   "size": 1126
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1086
+=======
+  "size": 1127
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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
@@ -838,4 +961,4 @@ sourceFile:global.ts
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 04c2107dad0a1..3e58849d1d85a 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
@@ -84,10 +84,20 @@ 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     {
@@ -100,7 +110,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -139,7 +149,13 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -180,10 +196,38 @@ 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",
+<<<<<<< HEAD
   "size": 1112
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1072
+=======
+  "size": 1113
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -629,7 +673,7 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: incremental-declaration-doesnt-change
 
@@ -644,14 +688,24 @@ Output::
     * lib/tsconfig.json
     * app/tsconfig.json
 
-[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] 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] 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     {
@@ -664,7 +718,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -691,7 +745,13 @@ const globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -732,10 +792,38 @@ 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",
+<<<<<<< HEAD
   "size": 1126
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1086
+=======
+  "size": 1127
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
@@ -884,4 +972,4 @@ sourceFile:global.ts
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map.baseline.txt] file written with same contents
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 968b7c09c1652..eb453b201bb1d 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
@@ -83,10 +83,23 @@ 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]
@@ -124,7 +137,13 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -166,10 +185,38 @@ 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",
+<<<<<<< HEAD
   "size": 1149
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1109
+=======
+  "size": 1150
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -196,7 +243,13 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -231,10 +284,34 @@ 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",
+<<<<<<< HEAD
   "size": 1171
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1131
+=======
+  "size": 1170
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/soltion/module.js.map.baseline.txt]
@@ -598,4 +675,4 @@ sourceFile:file4.ts
 >>>//# sourceMappingURL=module.d.ts.map
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 5a39c0810d5b0..d7591326c2462 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
@@ -46,6 +46,14 @@ 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]
@@ -78,7 +86,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -114,8 +128,36 @@ 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",
+<<<<<<< HEAD
   "size": 882
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 842
+=======
+  "size": 883
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -140,16 +182,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with sourceMap
 
@@ -160,10 +197,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -196,7 +241,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -233,8 +284,36 @@ 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",
+<<<<<<< HEAD
   "size": 899
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 859
+=======
+  "size": 900
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -263,11 +342,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -278,10 +357,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -314,7 +401,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -350,8 +443,36 @@ 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",
+<<<<<<< HEAD
   "size": 882
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 842
+=======
+  "size": 883
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -376,11 +497,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration, emit Dts and should not emit js
 
@@ -391,14 +512,28 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -435,8 +570,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 901
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 861
+=======
+  "size": 902
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -477,11 +640,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration and declarationMap
 
@@ -492,14 +655,28 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -537,8 +714,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 923
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 883
+=======
+  "size": 924
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -583,11 +788,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -598,12 +803,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: local change
 
@@ -617,10 +857,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -653,7 +901,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -689,8 +943,36 @@ 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",
+<<<<<<< HEAD
   "size": 883
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 843
+=======
+  "size": 884
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -715,16 +997,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration and declarationMap
 
@@ -735,14 +1012,28 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -780,8 +1071,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 925
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -810,11 +1129,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -825,12 +1144,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: with inlineSourceMap
 
@@ -841,10 +1195,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -877,7 +1239,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -914,8 +1282,36 @@ 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",
+<<<<<<< HEAD
   "size": 906
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 866
+=======
+  "size": 907
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -941,11 +1337,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with sourceMap
 
@@ -956,10 +1352,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -992,7 +1396,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1029,8 +1439,36 @@ 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",
+<<<<<<< HEAD
   "size": 900
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 860
+=======
+  "size": 901
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1059,11 +1497,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -1074,10 +1512,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1110,7 +1556,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1146,8 +1598,36 @@ 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",
+<<<<<<< HEAD
   "size": 883
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 843
+=======
+  "size": 884
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1172,11 +1652,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration and declarationMap
 
@@ -1187,14 +1667,28 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1232,8 +1726,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 925
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1262,11 +1784,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration and declarationMap, should not re-emit
 
@@ -1277,9 +1799,46 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
index 26e6e429dc787..d02fa80c830a6 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
@@ -46,6 +46,14 @@ 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]
@@ -93,7 +101,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -130,10 +144,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -158,16 +200,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with sourceMap
 
@@ -178,10 +215,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -214,7 +259,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -252,10 +303,38 @@ 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",
+<<<<<<< HEAD
   "size": 1199
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1159
+=======
+  "size": 1200
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -284,11 +363,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -299,10 +378,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -335,7 +422,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -372,10 +465,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -400,11 +521,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration should not emit anything
 
@@ -415,12 +536,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -431,12 +588,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration and declarationMap
 
@@ -447,10 +639,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -469,7 +669,13 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -508,10 +714,38 @@ 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",
+<<<<<<< HEAD
   "size": 1223
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1183
+=======
+  "size": 1224
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -541,11 +775,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: should re-emit only dts so they dont contain sourcemap
 
@@ -556,10 +790,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -578,7 +820,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -615,10 +863,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -643,11 +919,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with emitDeclarationOnly should not emit anything
 
@@ -658,12 +934,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -674,12 +986,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: local change
 
@@ -693,10 +1040,18 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -729,7 +1084,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -766,10 +1127,38 @@ 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",
+<<<<<<< HEAD
   "size": 1183
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1143
+=======
+  "size": 1184
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -794,16 +1183,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with declaration should not emit anything
 
@@ -814,12 +1198,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: with inlineSourceMap
 
@@ -830,10 +1250,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -866,7 +1294,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -904,10 +1338,38 @@ 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",
+<<<<<<< HEAD
   "size": 1206
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1166
+=======
+  "size": 1207
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -933,11 +1395,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: with sourceMap
 
@@ -948,10 +1410,18 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -984,7 +1454,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1022,10 +1498,38 @@ 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",
+<<<<<<< HEAD
   "size": 1200
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1160
+=======
+  "size": 1201
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1054,8 +1558,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 71bb19ea3ba37..953d14bca0227 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
@@ -74,10 +74,20 @@ 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     {
@@ -88,7 +98,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -108,7 +118,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -146,8 +162,36 @@ 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",
+<<<<<<< HEAD
   "size": 918
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 878
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -250,12 +294,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -285,7 +324,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -297,12 +336,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -313,11 +364,38 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 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: {
+  "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",
@@ -359,14 +437,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -377,13 +465,19 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -421,8 +515,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 933
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -449,12 +571,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -484,7 +601,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -496,14 +613,24 @@ 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 there is change in compilerOptions
+[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 '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     {
@@ -514,12 +641,18 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -557,8 +690,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 933
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 893
+=======
+  "size": 934
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -700,7 +861,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -730,7 +891,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -742,12 +903,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -758,11 +931,38 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 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: {
+  "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",
@@ -801,12 +1001,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -817,11 +1029,38 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 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: {
+  "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",
@@ -863,14 +1102,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -881,13 +1130,19 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -925,8 +1180,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 950
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 910
+=======
+  "size": 951
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -984,12 +1267,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1019,4 +1297,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 9390d78892269..cbd474cf487ff 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
@@ -72,10 +72,20 @@ 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     {
@@ -86,7 +96,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -106,7 +116,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"version":"FakeTSVersion"}
+{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -116,8 +126,9 @@ declare module "d" {
     "./src/c.ts",
     "./src/d.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 88
+  "size": 102
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -170,12 +181,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -204,7 +210,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -216,12 +222,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -232,14 +250,43 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
+//// [/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",
@@ -280,14 +327,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -298,7 +355,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -331,12 +388,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -365,7 +417,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -377,14 +429,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -395,7 +457,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -479,12 +541,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -513,7 +570,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -525,12 +582,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -541,14 +610,43 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
+//// [/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",
@@ -586,12 +684,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -602,15 +712,45 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
+//// [/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",
@@ -651,14 +791,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -669,7 +819,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -734,12 +884,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -768,4 +913,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 43b2c16fcadda..6bc5174660c78 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
@@ -72,10 +72,23 @@ 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]
@@ -94,7 +107,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -132,10 +151,38 @@ 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",
+<<<<<<< HEAD
   "size": 1199
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1159
+=======
+  "size": 1200
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -151,7 +198,13 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -188,10 +241,38 @@ 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",
+<<<<<<< HEAD
   "size": 1316
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1276
+=======
+  "size": 1317
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -217,12 +298,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -247,16 +323,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-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::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -268,14 +339,82 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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.
 
-[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'
+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": 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: change
 
@@ -290,18 +429,37 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
+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] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -339,13 +497,40 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1213
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1173
+=======
+  "size": 1214
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 
 Program root files: [
   "/home/src/workspaces/solution/project1/src/a.ts",
@@ -369,16 +554,36 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+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/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
+/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -390,18 +595,37 @@ 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 there is change in compilerOptions
+[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'...
 
-[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
+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.
+
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -439,14 +663,48 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1214
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1174
+=======
+  "size": 1215
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -483,10 +741,38 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1317
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1277
+=======
+  "size": 1318
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -563,7 +849,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -588,11 +874,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -604,14 +890,82 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 up to date because newest input 'project2/src/g.ts' is older than output 'project2/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:5:15 - 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": 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no change run with js emit
 
@@ -623,14 +977,82 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 up to date because newest input 'project2/src/g.ts' is older than output 'project2/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:5:15 - 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: js emit with change
 
@@ -645,18 +1067,37 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
+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] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
+[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.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -694,13 +1135,40 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1231
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1191
+=======
+  "size": 1232
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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";
@@ -755,13 +1223,33 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+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/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
+/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 51cce66a2b513..786cbe440bf4f 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
@@ -72,10 +72,20 @@ 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     {
@@ -86,7 +96,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -106,7 +116,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -144,8 +160,36 @@ 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",
+<<<<<<< HEAD
   "size": 918
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 878
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -248,12 +292,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -283,7 +322,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -295,12 +334,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -311,11 +362,38 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 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: {
+  "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",
@@ -357,14 +435,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -375,13 +463,19 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -419,8 +513,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 933
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -447,12 +569,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -482,7 +599,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: non local change
 
@@ -497,14 +614,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -515,7 +642,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -536,7 +663,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -574,8 +707,36 @@ 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",
+<<<<<<< HEAD
   "size": 953
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 913
+=======
+  "size": 954
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -667,12 +828,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -702,7 +858,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -714,14 +870,24 @@ 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 there is change in compilerOptions
+[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 '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     {
@@ -732,12 +898,18 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -774,8 +946,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 926
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 886
+=======
+  "size": 927
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -916,7 +1116,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -945,7 +1145,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -957,12 +1157,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 '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     {
@@ -973,11 +1185,38 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 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: {
+  "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",
@@ -1019,14 +1258,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -1037,13 +1286,19 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1080,8 +1335,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 944
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 904
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1139,12 +1422,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1173,7 +1451,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: local change
 
@@ -1188,14 +1466,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -1206,13 +1494,19 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1250,8 +1544,36 @@ Found 1 error.
     "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",
+<<<<<<< HEAD
   "size": 987
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 947
+=======
+  "size": 988
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1278,12 +1600,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1313,7 +1630,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: non local change
 
@@ -1328,14 +1645,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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 '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     {
@@ -1346,7 +1673,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -1368,7 +1695,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1406,8 +1739,36 @@ 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",
+<<<<<<< HEAD
   "size": 1011
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 971
+=======
+  "size": 1012
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -1499,12 +1860,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1534,7 +1890,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1549,14 +1905,24 @@ 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 there is change in compilerOptions
+[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 '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     {
@@ -1567,7 +1933,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -1590,7 +1956,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1627,8 +1999,36 @@ 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",
+<<<<<<< HEAD
   "size": 1006
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 966
+=======
+  "size": 1007
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -1754,12 +2154,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1788,4 +2183,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 54368261256f6..5debc2d1bdf44 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
@@ -70,10 +70,20 @@ 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     {
@@ -84,7 +94,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -104,7 +114,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"version":"FakeTSVersion"}
+{"root":["./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -114,8 +124,9 @@ declare module "d" {
     "./src/c.ts",
     "./src/d.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 88
+  "size": 102
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -168,12 +179,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -202,7 +208,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -214,12 +220,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -230,14 +248,43 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
+//// [/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",
@@ -278,14 +325,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -296,7 +353,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -329,12 +386,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -363,7 +415,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: non local change
 
@@ -378,14 +430,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -396,7 +458,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -444,12 +506,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -478,7 +535,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -490,14 +547,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -508,7 +575,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -592,12 +659,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -625,7 +687,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -637,12 +699,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -653,14 +727,43 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
+//// [/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",
@@ -701,14 +804,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -719,7 +832,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -784,12 +897,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -817,7 +925,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: local change
 
@@ -832,14 +940,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -850,7 +968,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -883,12 +1001,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -917,7 +1030,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: non local change
 
@@ -932,14 +1045,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -950,7 +1073,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -999,12 +1122,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1033,7 +1151,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1048,14 +1166,24 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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"
+                ~~~~~
+
 project2/src/tsconfig.json:8:5 - error TS6306: Referenced project '/home/src/workspaces/solution/project1/src' must have setting "composite": true.
 
  8     {
@@ -1066,7 +1194,7 @@ Output::
    ~~~~~
 
 
-Found 1 error.
+Found 3 errors.
 
 
 
@@ -1151,12 +1279,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1184,4 +1307,4 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 dc91110d60a32..282a114d9a116 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
@@ -70,10 +70,23 @@ 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]
@@ -92,7 +105,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -130,10 +149,38 @@ 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",
+<<<<<<< HEAD
   "size": 1199
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1159
+=======
+  "size": 1200
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -149,7 +196,13 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -186,10 +239,38 @@ 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",
+<<<<<<< HEAD
   "size": 1316
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1276
+=======
+  "size": 1317
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -215,12 +296,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -245,16 +321,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-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::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -266,14 +337,82 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
+Found 2 errors.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: local change
 
@@ -288,18 +427,37 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
+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] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -337,9 +495,32 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1213
 }
 
@@ -503,7 +684,414 @@ declare module "d" {
   "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": 1341
+  "size": 1341
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "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",
+  "/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
+
+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::
+
+exitCode:: ExitStatus.Success
+
+Change:: non local change
+
+Input::
+//// [/home/src/workspaces/solution/project1/src/a.ts]
+export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;
+
+
+/home/src/tslibs/TS/Lib/tsc.js --b project2/src --verbose --emitDeclarationOnly
+Output::
+[HH:MM:SS AM] Projects in this build: 
+    * project1/src/tsconfig.json
+    * project2/src/tsconfig.json
+
+[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'...
+
+[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'...
+
+
+
+//// [/home/src/workspaces/solution/project1/outFile.d.ts]
+declare module "a" {
+    export const a = 10;
+    export const aaa = 10;
+}
+declare module "b" {
+    export const b = 10;
+}
+declare module "c" {
+    export const c = 10;
+}
+declare module "d" {
+    export const d = 10;
+}
+
+
+//// [/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"},"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]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "./src/a.ts",
+    "./src/b.ts",
+    "./src/c.ts",
+    "./src/d.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; };",
+    "./src/a.ts": "-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;",
+    "./src/b.ts": "-6189287562-export const b = 10;const bLocal = 10;",
+    "./src/c.ts": "3248317647-import { a } from \"./a\";export const c = a;",
+    "./src/d.ts": "-19615769517-import { b } from \"./b\";export const d = b;"
+  },
+  "root": [
+    [
+      [
+        2,
+        5
+      ],
+      [
+        "./src/a.ts",
+        "./src/b.ts",
+        "./src/c.ts",
+        "./src/d.ts"
+      ]
+    ]
+  ],
+  "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",
+  "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"},"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]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "../project1/outfile.d.ts",
+    "./src/e.ts",
+    "./src/f.ts",
+    "./src/g.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; };",
+    "../project1/outfile.d.ts": "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",
+    "./src/e.ts": "-13789510868-export const e = 10;",
+    "./src/f.ts": "-4849089835-import { a } from \"a\"; export const f = a;",
+    "./src/g.ts": "-18341999015-import { b } from \"b\"; export const g = b;"
+  },
+  "root": [
+    [
+      [
+        3,
+        5
+      ],
+      [
+        "./src/e.ts",
+        "./src/f.ts",
+        "./src/g.ts"
+      ]
+    ]
+  ],
+  "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",
+  "size": 1301
+=======
+  "size": 1214
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+}
+
+
+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
+
+Change:: non local change
+
+Input::
+//// [/home/src/workspaces/solution/project1/src/a.ts]
+export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;
+
+
+/home/src/tslibs/TS/Lib/tsc.js --b project2/src --verbose --emitDeclarationOnly
+Output::
+[HH:MM:SS AM] Projects in this build: 
+    * 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"
+                ~~~~~
+
+
+Found 2 errors.
+
+
+
+//// [/home/src/workspaces/solution/project1/outFile.d.ts]
+declare module "a" {
+    export const a = 10;
+    export const aaa = 10;
+}
+declare module "b" {
+    export const b = 10;
+}
+declare module "c" {
+    export const c = 10;
+}
+declare module "d" {
+    export const d = 10;
+}
+
+
+//// [/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"}
+
+//// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "./src/a.ts",
+    "./src/b.ts",
+    "./src/c.ts",
+    "./src/d.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; };",
+    "./src/a.ts": "-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;",
+    "./src/b.ts": "-6189287562-export const b = 10;const bLocal = 10;",
+    "./src/c.ts": "3248317647-import { a } from \"./a\";export const c = a;",
+    "./src/d.ts": "-19615769517-import { b } from \"./b\";export const d = b;"
+  },
+  "root": [
+    [
+      [
+        2,
+        5
+      ],
+      [
+        "./src/a.ts",
+        "./src/b.ts",
+        "./src/c.ts",
+        "./src/d.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "emitDeclarationOnly": true,
+    "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
+}
+
+//// [/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"}
+
+//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "../project1/outfile.d.ts",
+    "./src/e.ts",
+    "./src/f.ts",
+    "./src/g.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; };",
+    "../project1/outfile.d.ts": "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",
+    "./src/e.ts": "-13789510868-export const e = 10;",
+    "./src/f.ts": "-4849089835-import { a } from \"a\"; export const f = a;",
+    "./src/g.ts": "-18341999015-import { b } from \"b\"; export const g = b;"
+  },
+  "root": [
+    [
+      [
+        3,
+        5
+      ],
+      [
+        "./src/e.ts",
+        "./src/f.ts",
+        "./src/g.ts"
+      ]
+    ]
+  ],
+  "options": {
+    "composite": true,
+    "emitDeclarationOnly": true,
+    "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
 }
 
 
@@ -529,12 +1117,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -559,16 +1142,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-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::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: emit js files
 
@@ -580,18 +1158,37 @@ 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 there is change in compilerOptions
+[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'...
 
-[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
+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.
+
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -628,14 +1225,48 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1232
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1192
+=======
+  "size": 1233
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -671,10 +1302,38 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1314
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1274
+=======
+  "size": 1315
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -751,7 +1410,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -775,11 +1434,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -791,14 +1450,82 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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 '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 'project2/src/tsconfig.json' is up to date because newest input 'project2/src/g.ts' is older than output 'project2/outFile.tsbuildinfo'
+
+Found 2 errors.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -813,18 +1540,37 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
+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] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -861,13 +1607,40 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1250
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1210
+=======
+  "size": 1251
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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";
@@ -922,16 +1695,35 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+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::
 /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
+/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: local change
 
@@ -946,18 +1738,37 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is up to date with .d.ts files from its dependencies
+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.
 
-[HH:MM:SS AM] Updating output timestamps of project '/home/src/workspaces/solution/project2/src/tsconfig.json'...
+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.
 
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -995,13 +1806,40 @@ Output::
     "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",
+<<<<<<< HEAD
   "size": 1293
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1253
+=======
+  "size": 1294
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
 
 Program root files: [
   "/home/src/workspaces/solution/project1/src/a.ts",
@@ -1025,16 +1863,36 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-Semantic diagnostics in builder refreshed for::
+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/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
+/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: non local change
 
@@ -1049,14 +1907,27 @@ Output::
     * project1/src/tsconfig.json
     * project2/src/tsconfig.json
 
-[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] 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'...
 
-[HH:MM:SS AM] Project 'project2/src/tsconfig.json' is out of date because output 'project2/outFile.tsbuildinfo' is older than input 'project1/src'
+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.
+
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -1077,7 +1948,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1115,14 +1992,48 @@ 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",
+<<<<<<< HEAD
   "size": 1349
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1309
+=======
+  "size": 1350
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1159,10 +2070,38 @@ 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",
+<<<<<<< HEAD
   "size": 1373
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1333
+=======
+  "size": 1374
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1188,12 +2127,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1218,16 +2152,11 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-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::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: js emit with change without emitDeclarationOnly
 
@@ -1242,14 +2171,27 @@ 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 there is change in compilerOptions
+[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'...
 
-[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
+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.
+
 
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts]
@@ -1271,7 +2213,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1308,14 +2256,48 @@ 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",
+<<<<<<< HEAD
   "size": 1370
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1330
+=======
+  "size": 1371
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1351,10 +2333,38 @@ 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",
+<<<<<<< HEAD
   "size": 1372
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1332
+=======
+  "size": 1373
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1415,12 +2425,7 @@ Program files::
 /home/src/workspaces/solution/project1/src/c.ts
 /home/src/workspaces/solution/project1/src/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1444,13 +2449,8 @@ Program files::
 /home/src/workspaces/solution/project2/src/f.ts
 /home/src/workspaces/solution/project2/src/g.ts
 
-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::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 3a61f9449c5e8..4619eccdb92c2 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,7 +27,6 @@ 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:
@@ -54,6 +53,5 @@ 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 5b8adc9f699d2..855f5f853cc23 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
@@ -38,13 +38,18 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -73,7 +78,13 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -102,11 +113,30 @@ 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",
+<<<<<<< HEAD
   "size": 920
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 880
+=======
+  "size": 903
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -133,13 +163,18 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -155,13 +190,18 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -193,7 +233,13 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -223,11 +269,30 @@ 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",
+<<<<<<< HEAD
   "size": 1005
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 965
+=======
+  "size": 988
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -239,13 +304,18 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -272,11 +342,26 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/home/src/workspaces/outFile.tsbuildinfo]
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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"}
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
+<<<<<<< HEAD
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
   "fileNames": [
@@ -313,3 +398,43 @@ Output::
 
 
 exitCode:: ExitStatus.Success
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+=======
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 513495c02bbe1..5acd87ea5ea62 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
@@ -58,6 +58,11 @@ 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
@@ -67,7 +72,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -81,7 +86,13 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -108,6 +119,20 @@ 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",
@@ -123,7 +148,13 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1134
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1094
+=======
+  "size": 1131
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -147,6 +178,11 @@ 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
@@ -154,7 +190,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
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 7efc00483106f..92dd0320ccf9f 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
@@ -57,6 +57,11 @@ 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
@@ -68,7 +73,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -115,6 +120,11 @@ 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
@@ -126,7 +136,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
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 7fc3ae102971c..402f74980aee9 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
@@ -49,6 +49,11 @@ 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
@@ -56,6 +61,9 @@ 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]
@@ -77,7 +85,7 @@ define("child", ["require", "exports", "child2"], function (require, exports, ch
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-{"root":["./child/child.ts","./child/child2.ts"],"version":"FakeTSVersion"}
+{"root":["./child/child.ts","./child/child2.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -85,12 +93,13 @@ define("child", ["require", "exports", "child2"], function (require, exports, ch
     "./child/child.ts",
     "./child/child2.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 75
+  "size": 89
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: delete child2 file
 
@@ -102,7 +111,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 file 'child/child2.ts' was root file of compilation but not any more.
+[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] Building project '/home/src/workspaces/solution/child/tsconfig.json'...
 
@@ -114,10 +123,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/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?
+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.
 
-1 import { child2 } from "../child/child2";
-                         ~~~~~~~~~~~~~~~~~
+4     "module": "amd"
+                ~~~~~
 
 ../../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 1995b8ae05add..f4d66334322c4 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
@@ -72,6 +72,11 @@ 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
@@ -123,12 +128,20 @@ 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]
@@ -159,7 +172,13 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child2.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -188,10 +207,30 @@ 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",
+<<<<<<< HEAD
   "size": 1008
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 968
+=======
+  "size": 1005
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/mainResult.js]
@@ -212,7 +251,13 @@ declare module "main" {
 
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -237,14 +282,34 @@ 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",
+<<<<<<< HEAD
   "size": 1023
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 983
+=======
+  "size": 1020
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: delete child2 file
 
@@ -257,7 +322,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 file 'child/child2.ts' was root file of compilation but not any more.
+[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] Building project '/home/src/workspaces/solution/child/tsconfig.json'...
 
@@ -269,16 +334,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/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?
+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.
 
-1 import { child2 } from "../child/child2";
-                         ~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 ../../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 output 'mainResult.tsbuildinfo' is older than input 'child'
+[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] Building project '/home/src/workspaces/solution/main/tsconfig.json'...
 
@@ -322,6 +387,11 @@ 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
@@ -329,7 +399,7 @@ childResult.d.ts
 main/main.ts
   Matched by default include pattern '**/*'
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -351,7 +421,13 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -375,28 +451,36 @@ declare module "child" {
     "outFile": "./childResult.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./child/child.ts",
-      [
-        {
-          "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
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "outSignature": "8966811613-declare module \"child\" {\n    export function child(): void;\n}\n",
   "latestChangedDtsFile": "./childResult.d.ts",
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1119
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1079
+=======
+  "size": 867
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/mainResult.js] file written with same contents
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -421,11 +505,31 @@ 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",
+<<<<<<< HEAD
   "size": 954
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 914
+=======
+  "size": 951
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 9858bf4d0684b..e859968afda99 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors-discrepancies.js
@@ -8,6 +8,7 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -17,6 +18,7 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -30,6 +32,7 @@ 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 d2a08a10f4007..1bdec8772adc1 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
@@ -51,8 +51,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.
 
-Found 1 error.
+5     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -206,6 +211,14 @@ 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]
@@ -305,7 +318,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -336,10 +349,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -368,8 +395,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -391,14 +438,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -409,12 +453,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -458,8 +534,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.
 
-Found 1 error.
+5     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -620,13 +701,24 @@ 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.
 
-Found 1 error.
+5     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -655,6 +747,20 @@ 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"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -679,7 +785,13 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -701,10 +813,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -726,6 +835,14 @@ 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]
@@ -817,7 +934,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -832,10 +949,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -864,8 +995,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -887,14 +1038,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -908,14 +1056,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -944,7 +1092,13 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -979,21 +1133,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1029,11 +1193,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1065,8 +1225,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.
 
-Found 1 error.
+5     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -1221,6 +1386,14 @@ 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]
@@ -1329,7 +1502,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -1344,10 +1517,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1355,7 +1528,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1390,21 +1569,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1428,11 +1617,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1467,10 +1652,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1498,7 +1683,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 d02758a1dbdc2..306f979a9f7f8 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/dts-errors.js
@@ -50,10 +50,15 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -140,10 +145,15 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -191,6 +201,14 @@ 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]
@@ -208,20 +226,8 @@ define("b", ["require", "exports"], function (require, exports) {
 });
 
 
-//// [/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.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]
 declare module "a" {
     export const a = "hello";
@@ -254,7 +260,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -285,11 +291,19 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -297,8 +311,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -320,14 +335,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -338,12 +350,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -387,10 +434,15 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -494,10 +546,15 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -535,10 +592,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -560,6 +614,14 @@ 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]
@@ -578,7 +640,7 @@ define("b", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -586,9 +648,10 @@ define("b", ["require", "exports"], function (require, exports) {
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 90
+  "size": 104
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -615,7 +678,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -630,11 +693,19 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -642,8 +713,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -665,14 +737,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -686,14 +755,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -768,11 +837,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -804,10 +869,15 @@ 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 1 error.
+Found 2 errors.
 
 
 
@@ -897,6 +967,14 @@ 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]
@@ -920,21 +998,8 @@ define("c", ["require", "exports"], function (require, exports) {
 });
 
 
-//// [/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.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: [
@@ -961,7 +1026,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -976,10 +1041,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1023,11 +1088,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1062,10 +1123,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1096,11 +1157,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 9858bf4d0684b..e859968afda99 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors-discrepancies.js
@@ -8,6 +8,7 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -17,6 +18,7 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -30,6 +32,7 @@ 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 b18b0c1a8d973..22b1bab7580e0 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
@@ -41,6 +41,14 @@ 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]
@@ -140,7 +148,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -174,6 +182,14 @@ 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
@@ -259,7 +275,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -290,10 +306,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -322,8 +352,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -345,14 +395,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -363,12 +410,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -402,6 +481,14 @@ 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
@@ -487,7 +574,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -518,10 +605,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const a: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -529,7 +616,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -559,21 +652,27 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 722
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -595,10 +694,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -620,6 +716,14 @@ 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
@@ -705,7 +809,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -720,10 +824,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -752,8 +870,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -775,14 +913,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -796,14 +931,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -844,7 +979,13 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -879,21 +1020,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -917,11 +1068,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -943,6 +1090,14 @@ 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
@@ -1042,7 +1197,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix `a` error with noCheck
 
@@ -1060,6 +1215,14 @@ 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
@@ -1159,7 +1322,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -1174,10 +1337,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1185,7 +1348,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1220,21 +1389,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1258,11 +1437,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1297,10 +1472,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1328,7 +1503,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 6f704d7a31e33..9ecb5286b5aa7 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/semantic-errors.js
@@ -40,6 +40,14 @@ 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]
@@ -67,7 +75,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -75,9 +83,10 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 90
+  "size": 104
 }
 
 
@@ -103,7 +112,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -137,6 +146,14 @@ 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
@@ -174,7 +191,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -205,12 +222,20 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,8 +243,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 
@@ -240,14 +266,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -258,12 +281,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -297,6 +355,14 @@ 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
@@ -310,7 +376,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -318,9 +384,10 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 90
+  "size": 104
 }
 
 
@@ -346,7 +413,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -377,10 +444,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -421,10 +488,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -446,6 +510,14 @@ 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
@@ -459,7 +531,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -467,9 +539,10 @@ declare module "b" {
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 90
+  "size": 104
 }
 
 
@@ -495,7 +568,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -510,12 +583,20 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -523,8 +604,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 
@@ -545,14 +627,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -566,14 +645,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -648,11 +727,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -674,6 +749,14 @@ 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
@@ -690,7 +773,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts","./project/c.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -699,9 +782,10 @@ declare module "c" {
     "./project/b.ts",
     "./project/c.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 107
+  "size": 121
 }
 
 
@@ -729,7 +813,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix `a` error with noCheck
 
@@ -747,6 +831,14 @@ 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
@@ -789,7 +881,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -804,10 +896,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -851,11 +943,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -890,10 +978,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -924,11 +1012,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 9858bf4d0684b..e859968afda99 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors-discrepancies.js
@@ -8,6 +8,7 @@ CleanBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion"
 }
@@ -17,6 +18,7 @@ IncrementalBuild:
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion"
 }
 15:: no-change-run
@@ -30,6 +32,7 @@ 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 15213deb8e3a5..63f361b75c04d 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
@@ -182,6 +182,14 @@ 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]
@@ -273,7 +281,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -304,10 +312,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -336,8 +358,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -359,14 +401,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -377,12 +416,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -645,6 +716,14 @@ 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]
@@ -736,7 +815,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -751,10 +830,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -783,8 +876,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -806,14 +919,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -827,14 +937,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -875,7 +985,13 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -910,21 +1026,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -948,11 +1074,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1108,6 +1230,14 @@ 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]
@@ -1216,7 +1346,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -1231,10 +1361,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1242,7 +1372,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1277,21 +1413,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1315,11 +1461,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1354,10 +1496,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1385,7 +1527,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 2acf0d5626a08..f2028357a8448 100644
--- a/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noCheck/outFile/syntax-errors.js
@@ -146,6 +146,14 @@ 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]
@@ -164,20 +172,8 @@ 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"],"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.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",
@@ -201,7 +197,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -232,12 +228,20 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -245,8 +249,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 
@@ -267,14 +272,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -285,12 +287,47 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'a.ts' is older than output '../outFile.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: no-change-run
 
@@ -485,6 +522,14 @@ 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]
@@ -504,7 +549,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"],"checkPending":true,"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"checkPending":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -512,9 +557,10 @@ define("b", ["require", "exports"], function (require, exports) {
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 90
+  "size": 104
 }
 
 
@@ -540,7 +586,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -555,12 +601,20 @@ 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"],"version":"FakeTSVersion"}
+{"root":["./project/a.ts","./project/b.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -568,8 +622,9 @@ Output::
     "./project/a.ts",
     "./project/b.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 70
+  "size": 84
 }
 
 
@@ -590,14 +645,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Add file with error
 
@@ -611,14 +663,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -693,11 +745,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -810,6 +858,14 @@ 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]
@@ -834,21 +890,8 @@ define("c", ["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","./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.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",
@@ -874,7 +917,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with checking
 
@@ -889,10 +932,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -936,11 +979,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -975,10 +1014,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1009,11 +1048,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 10cb7bf8a8311..1c8642c343696 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
@@ -61,10 +61,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -136,7 +136,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -180,24 +186,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -216,10 +243,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -234,10 +269,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -257,33 +300,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -326,73 +360,19 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2653
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2613
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -416,10 +396,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -428,7 +408,13 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -472,24 +458,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -508,10 +515,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -534,10 +541,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -552,10 +567,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -570,10 +593,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -601,33 +624,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -696,7 +699,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -740,68 +749,45 @@ 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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2635
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2595
+=======
+  "size": 1849
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -820,33 +806,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+tsconfig.json:5:15 - 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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -866,28 +832,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -907,28 +858,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -948,33 +884,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+tsconfig.json:5:15 - 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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -999,10 +915,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1045,33 +975,23 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2074
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2034
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1086,10 +1006,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -1161,7 +1081,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1205,24 +1131,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1241,10 +1188,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1259,10 +1214,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1277,10 +1240,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 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 eb14f61c82ba7..de28cc737c63b 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
@@ -62,10 +62,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -137,7 +137,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -181,22 +187,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -215,10 +242,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -233,10 +268,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -256,33 +299,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -325,71 +359,17 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2104
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2064
+=======
+  "size": 1273
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -413,10 +393,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -426,7 +406,13 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -470,22 +456,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -504,10 +511,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -530,10 +537,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -548,10 +563,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -566,10 +589,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -597,33 +620,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -692,7 +695,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -736,66 +745,43 @@ 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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2084
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2044
+=======
+  "size": 1298
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -814,33 +800,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -860,28 +826,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -901,28 +852,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -942,33 +878,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -993,10 +909,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1039,31 +969,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1271
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1078,10 +998,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -1153,7 +1073,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1197,22 +1123,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1231,10 +1178,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1249,10 +1204,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1267,10 +1230,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 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 92887688775ac..363a38990293b 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
@@ -61,10 +61,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -116,7 +116,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -159,22 +165,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -193,10 +220,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -211,10 +246,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -234,33 +277,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -302,71 +336,17 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2085
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2045
+=======
+  "size": 1254
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -390,10 +370,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -402,7 +382,13 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -445,22 +431,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -479,10 +486,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -505,10 +512,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -523,10 +538,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -541,10 +564,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -572,33 +595,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -647,7 +650,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -690,66 +699,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2065
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2025
+=======
+  "size": 1279
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -768,33 +754,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+tsconfig.json:5:15 - 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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -814,28 +780,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -855,28 +806,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
-
-2 new indirectClass().classC.prop;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
@@ -896,33 +832,13 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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.
+tsconfig.json:5:15 - 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/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.
-
-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.
+Found 1 error.
 
 
 
@@ -947,10 +863,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -992,31 +922,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1252
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1031,10 +951,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -1086,7 +1006,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1129,22 +1055,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1163,10 +1110,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1181,10 +1136,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1199,10 +1162,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 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 a99ee61b10b09..0746abad1d51a 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
@@ -61,10 +61,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -107,31 +121,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1521
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1481
+=======
+  "size": 1281
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -146,10 +156,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -157,7 +167,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -201,24 +217,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -306,38 +343,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -381,68 +404,45 @@ Found 3 errors.
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2635
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2595
+=======
+  "size": 1849
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -530,10 +530,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -576,33 +590,23 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2074
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2034
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -617,10 +621,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -628,7 +632,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -672,24 +682,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 dfc7a5d8d3dcf..0405cf22e5b0e 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
@@ -62,10 +62,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -108,31 +122,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1283
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -147,10 +157,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -158,7 +168,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -202,22 +218,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -305,38 +342,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -380,66 +403,43 @@ Found 3 errors.
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2084
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2044
+=======
+  "size": 1298
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -527,10 +527,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -573,31 +587,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1271
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -612,10 +616,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -623,7 +627,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -667,22 +677,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 e957e84ca54c7..a01573c7a666d 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
@@ -61,10 +61,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -106,31 +120,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1264
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -145,10 +155,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -156,7 +166,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -199,22 +215,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -282,38 +319,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
-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.
+Found 1 error.
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -356,66 +379,43 @@ Found 3 errors.
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2065
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2025
+=======
+  "size": 1279
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -483,10 +483,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -528,31 +542,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1252
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -567,10 +571,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/tsconfig.json'...
 
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
 Found 1 error.
@@ -578,7 +582,13 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -621,22 +631,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 5fde565c432c6..e3c66a852c1b8 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,6 +53,7 @@ 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -102,4 +103,58 @@ IncrementalBuild:
     "outFile": "./outFile.js"
   },
   "version": "FakeTSVersion"
-}
\ No newline at end of file
+}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 60f2ec18e6651..45d4f2589c10c 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
@@ -40,10 +40,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -71,12 +85,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 733
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 693
+=======
+  "size": 697
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -98,14 +119,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -116,12 +134,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -132,19 +182,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 there is change in compilerOptions
+[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'...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -152,7 +197,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -181,35 +232,19 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 716
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -232,7 +267,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -251,15 +286,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -267,7 +297,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -297,35 +333,19 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1077
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1037
+=======
+  "size": 738
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -349,7 +369,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -364,12 +384,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Dts Emit with error
 
@@ -394,13 +446,24 @@ 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.
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -429,6 +492,20 @@ 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"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -453,7 +530,13 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -495,7 +578,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -513,14 +596,28 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -548,9 +645,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 732
@@ -575,14 +671,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit
 
@@ -593,14 +686,28 @@ 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 there is change in compilerOptions
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -629,12 +736,17 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 748
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 708
+=======
+  "size": 711
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -657,11 +769,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration and declarationMap noEmit
 
@@ -672,9 +784,81 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
 
+//// [/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::
 
-exitCode:: ExitStatus.Success
+No shapes updated in the builder::
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 436f6cd22d4d9..c3878746b89a3 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
@@ -46,10 +46,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -85,12 +99,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 885
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 845
+=======
+  "size": 853
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -116,16 +139,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -136,12 +154,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -152,47 +206,28 @@ 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 there is change in compilerOptions
+[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'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 3 errors.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -229,77 +264,21 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1765
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1725
+=======
+  "size": 872
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -326,7 +305,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -345,43 +324,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+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.
 
-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.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -419,77 +379,21 @@ Found 3 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1787
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1747
+=======
+  "size": 894
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -517,7 +421,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -532,12 +436,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'd.ts' is older than output '../outFile.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Dts Emit with error
 
@@ -582,13 +522,24 @@ 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.
 
-Found 3 errors.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 4 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -625,6 +576,28 @@ Found 3 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",
@@ -691,7 +664,13 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1748
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1708
+=======
+  "size": 1749
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -759,7 +738,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -777,14 +756,28 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -820,9 +813,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 884
@@ -851,16 +843,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit
 
@@ -871,37 +858,28 @@ 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 there is change in compilerOptions
+[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'...
 
-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.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -938,56 +916,17 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1485
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1445
+=======
+  "size": 863
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1014,7 +953,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1033,33 +972,24 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-c.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 export const c = class { private p = 10; };
-               ~
+4     "module": "amd",
+                ~~~~~
 
-  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 2 errors.
+Found 1 error.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1097,56 +1027,17 @@ Found 2 errors.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 885
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1174,7 +1065,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1196,15 +1087,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const d = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable d.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -1212,7 +1098,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1250,35 +1142,18 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/c.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1227
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1187
+=======
+  "size": 886
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1306,12 +1181,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 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
new file mode 100644
index 0000000000000..c31c43cffeb6f
--- /dev/null
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
@@ -0,0 +1,103 @@
+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 1aabbbc8e7d0e..9e6d7f0ba0d0a 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
@@ -41,15 +41,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -57,7 +52,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -86,35 +87,19 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 716
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -137,10 +122,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -159,15 +141,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -194,7 +171,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -216,10 +193,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -248,12 +239,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 734
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 694
+=======
+  "size": 701
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -276,14 +274,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -294,12 +289,45 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -310,14 +338,28 @@ 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 some of the changes were not emitted
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -346,8 +388,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -393,11 +455,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -408,12 +470,45 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -427,19 +522,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -447,7 +537,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -476,35 +572,17 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 712
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -527,10 +605,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -559,13 +634,24 @@ 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.
+
+Found 2 errors.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -594,6 +680,20 @@ 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"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -618,7 +718,13 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -660,7 +766,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -679,15 +785,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -714,7 +815,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 07061368d7229..5164dffda45c6 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
@@ -40,10 +40,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -71,12 +85,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 733
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 693
+=======
+  "size": 697
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -98,14 +119,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -116,12 +134,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'b.ts' is older than output '../outFile.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Fix error
 
@@ -135,14 +185,28 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -170,12 +234,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -197,14 +268,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -215,12 +283,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Emit after fixing error
 
@@ -231,14 +331,28 @@ 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 some of the changes were not emitted
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -266,8 +380,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -303,11 +437,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -318,12 +452,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Introduce error
 
@@ -337,14 +503,28 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -372,9 +552,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 733
@@ -399,14 +578,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit when error
 
@@ -417,14 +593,28 @@ 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 some of the changes were not emitted
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -452,8 +642,28 @@ 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",
+<<<<<<< HEAD
   "size": 713
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 673
+=======
+  "size": 710
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -494,11 +704,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -509,9 +719,41 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
 
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 7a9f04d5ffd74..742467087026b 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
@@ -40,10 +40,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -51,7 +51,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -79,26 +85,19 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 689
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -120,10 +119,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -142,10 +138,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -171,7 +167,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -193,10 +189,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -224,12 +234,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -251,14 +268,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -269,12 +283,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Emit after fixing error
 
@@ -285,14 +331,28 @@ 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 some of the changes were not emitted
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -320,8 +380,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -357,11 +437,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -372,12 +452,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -391,14 +503,14 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -406,7 +518,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -434,26 +552,17 @@ Found 1 error.
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 685
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -475,10 +584,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -497,10 +603,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -508,7 +614,13 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -537,21 +649,27 @@ Found 1 error.
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 857
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 817
+=======
+  "size": 702
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -573,7 +691,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -592,10 +710,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -621,7 +739,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 208bdb56ab36d..fe8d9b592eac4 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
@@ -177,10 +177,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -208,12 +222,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -235,14 +256,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -253,12 +271,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -269,14 +319,28 @@ 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 some of the changes were not emitted
+[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.
+
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -304,8 +368,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -341,11 +425,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -356,12 +440,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Introduce error
 
@@ -375,7 +491,7 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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'...
 
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 0b74f22406003..161c9326e7be7 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
@@ -52,15 +52,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -68,7 +63,13 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -103,35 +104,19 @@ 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 | DtsEmit",
-    17
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1274
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1234
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -179,15 +164,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -240,10 +220,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -278,10 +272,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 943
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
+=======
+  "size": 937
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -323,6 +329,50 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -353,7 +403,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -364,9 +414,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
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 fb89517aba941..354f056e42faa 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
@@ -51,15 +51,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -125,15 +120,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
 Found 1 error.
@@ -191,8 +181,17 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -248,6 +247,66 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -277,7 +336,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -288,9 +347,49 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
+
+
+
+//// [/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 d0fcdc7917cda..9174590a799c6 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
@@ -51,6 +51,7 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -74,10 +75,50 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -111,8 +152,19 @@ define("src/other", ["require", "exports"], function (require, exports) {
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 926
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -144,7 +196,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -155,12 +207,46 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/other.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Fix error
 
@@ -176,15 +262,28 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
-//// [/user/username/projects/dev-build.js] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,8 +317,19 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 918
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -251,7 +361,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -262,9 +372,43 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
+
+
+
 
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
index 602a358abee9e..3f9d7f368fe3a 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
@@ -50,6 +50,7 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -73,10 +74,44 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-{"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
+{"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]
 {
@@ -85,8 +120,9 @@ define("src/other", ["require", "exports"], function (require, exports) {
     "./noemitonerror/src/main.ts",
     "./noemitonerror/src/other.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 134
+  "size": 148
 }
 
 
@@ -117,7 +153,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -128,12 +164,51 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/other.ts' is older than output '../dev-build.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
 
 Change:: Fix error
 
@@ -149,13 +224,20 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[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] 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.
+
 
 
-//// [/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
 
@@ -186,7 +268,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -197,9 +279,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
+
+
+
+//// [/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 7a1504a09b4eb..e6a9bfeb2f909 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
@@ -56,8 +56,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -169,8 +174,13 @@ 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.
+
+Found 2 errors.
 
 
 
@@ -219,10 +229,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -257,10 +281,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 935
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 895
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -290,6 +326,38 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -320,7 +388,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -331,9 +399,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
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 4f24933573808..54b3986fa99a3 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
@@ -55,8 +55,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -124,8 +129,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -179,8 +189,17 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -224,6 +243,54 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -253,7 +320,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -264,9 +331,49 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
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 9224d3d7bf057..2f7cf3b8a02b4 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
@@ -55,8 +55,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -166,8 +171,13 @@ 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.
+
+Found 2 errors.
 
 
 
@@ -215,10 +225,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -252,10 +276,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 910
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -273,6 +309,26 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -302,7 +358,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -313,9 +369,43 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
index 3b200e16a6d5f..ba5532eda17c8 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
@@ -54,8 +54,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -122,8 +127,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -176,8 +186,17 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -209,6 +228,42 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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.tsbuildinfo] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -237,7 +292,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -248,9 +303,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
 
 
 
+//// [/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
 
-exitCode:: ExitStatus.Success
+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
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 458a4e8a34b8e..5fa936e9ca081 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
@@ -59,8 +59,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -159,8 +164,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -211,10 +221,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -249,10 +273,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 944
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 904
+=======
+  "size": 938
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -284,6 +320,40 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -314,7 +384,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -325,9 +395,44 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
+
+
+
+
+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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 531f2dce117d2..9a7a8b78517de 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
@@ -58,8 +58,13 @@ 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.
+
+Found 2 errors.
 
 
 
@@ -127,8 +132,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -184,8 +194,17 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -231,6 +250,56 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -260,7 +329,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -271,9 +340,49 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
+
+
+
+//// [/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 80f63f685a8c1..e993fecaeba47 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
@@ -58,8 +58,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -156,8 +161,13 @@ 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.
+
+Found 2 errors.
 
 
 
@@ -207,10 +217,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -244,10 +268,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 925
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 885
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -267,6 +303,28 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -296,7 +354,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -307,9 +365,43 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.tsbuildinfo'
+[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.
 
 
 
 
-exitCode:: ExitStatus.Success
+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
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
index 69a17ebf30347..d83a3091fa000 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
@@ -57,8 +57,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -125,8 +130,13 @@ 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.
 
-Found 1 error.
+4     "module": "amd",
+                ~~~~~
+
+
+Found 2 errors.
 
 
 
@@ -181,8 +191,17 @@ 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.
+
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -216,6 +235,44 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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.tsbuildinfo] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -244,7 +301,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -255,9 +312,48 @@ Output::
 [HH:MM:SS AM] Projects in this build: 
     * tsconfig.json
 
-[HH:MM:SS AM] Project 'tsconfig.json' is up to date because newest input 'src/main.ts' is older than output '../dev-build.js'
+[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.
+
+
+
+//// [/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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 d1d7a3156992e..805966c93cf62 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
@@ -140,14 +140,32 @@ 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]
@@ -201,7 +219,13 @@ declare function f(): string;
 //# sourceMappingURL=first_part3.d.ts.map
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./first_part1.ts","./first_part2.ts","./first_part3.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -275,9 +299,33 @@ 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",
+<<<<<<< HEAD
   "size": 1443
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1403
+=======
+  "size": 1442
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/second/second_part1.js.map]
@@ -324,7 +372,13 @@ declare class C {
 //# sourceMappingURL=second_part2.d.ts.map
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./second_part1.ts","./second_part2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -385,9 +439,29 @@ 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",
+<<<<<<< HEAD
   "size": 1319
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1279
+=======
+  "size": 1316
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/solution/third/third_part1.js.map]
@@ -406,7 +480,13 @@ declare var c: C;
 //# sourceMappingURL=third_part1.d.ts.map
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -497,10 +577,46 @@ 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",
+<<<<<<< HEAD
   "size": 1621
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1581
+=======
+  "size": 1626
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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
new file mode 100644
index 0000000000000..a4c8e54197d92
--- /dev/null
+++ b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
@@ -0,0 +1,76 @@
+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 36177301437bc..296a2c616041b 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
@@ -205,6 +205,14 @@ 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]
@@ -230,7 +238,13 @@ define(["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./anothermodule.ts","./index.ts","./some_decl.d.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -284,9 +298,16 @@ define(["require", "exports"], function (require, exports) {
   "options": {
     "module": 2
   },
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 995
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 955
+=======
+  "size": 969
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 8d27c8994434b..148ae62ff9ef3 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
@@ -86,6 +86,11 @@ 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
@@ -94,6 +99,16 @@ Output::
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
+<<<<<<< HEAD
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+Found 1 error.
+
+=======
+
+Found 2 errors.
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/transitiveReferences/a.js]
@@ -166,7 +181,13 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -217,9 +238,29 @@ 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",
+<<<<<<< HEAD
   "size": 915
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 875
+=======
+  "size": 912
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 41999419ab503..fbbaf718c9d5c 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
@@ -41,12 +41,17 @@ 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 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -75,7 +80,13 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -104,11 +115,30 @@ 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",
+<<<<<<< HEAD
   "size": 939
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 899
+=======
+  "size": 922
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -138,10 +168,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -178,12 +205,17 @@ 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 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -208,7 +240,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -233,12 +265,17 @@ 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 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -267,7 +304,13 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -297,11 +340,30 @@ 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",
+<<<<<<< HEAD
   "size": 963
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 923
+=======
+  "size": 946
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -325,10 +387,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -351,12 +410,17 @@ 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 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -381,7 +445,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -417,10 +481,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/outFile.tsbuildinfo]
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
@@ -458,6 +528,46 @@ Output::
   "size": 949
 }
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+}
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -479,7 +589,7 @@ Program files::
 /user/username/projects/myproject/a.ts
 /user/username/projects/myproject/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 abe0e5e552cfb..dfc0a4774bb7f 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
@@ -93,7 +93,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/project2/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -198,7 +203,13 @@ export {};
 
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -259,9 +270,33 @@ 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",
+<<<<<<< HEAD
   "size": 973
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 933
+=======
+  "size": 972
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -358,11 +393,7 @@ Program files::
 /user/username/projects/myproject/project2/index.ts
 /user/username/projects/myproject/node_modules/@types/foo/index.d.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -395,7 +426,12 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/project1/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
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 280411e2fbd18..9f8b03c218e9f 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
@@ -45,22 +45,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -89,35 +90,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 716
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -153,10 +138,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -185,12 +167,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -219,12 +212,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 734
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 694
+=======
+  "size": 701
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -249,10 +249,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -284,16 +281,27 @@ 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 some of the changes were not emitted
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -322,8 +330,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -371,7 +399,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -404,11 +432,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 output '../outFile.tsbuildinfo' is older than input '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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -434,7 +467,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -459,26 +492,27 @@ 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 output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[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'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -507,35 +541,17 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 712
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -560,10 +576,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -609,12 +622,23 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -643,6 +667,20 @@ 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",
@@ -667,7 +705,13 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -711,7 +755,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -748,15 +792,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -784,7 +823,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 7e28ab5acfbf6..bf1dd4ad67915 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
@@ -44,12 +44,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -77,12 +88,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 733
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 693
+=======
+  "size": 697
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -117,10 +135,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -145,16 +160,27 @@ 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 output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -182,12 +208,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -211,10 +244,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -245,16 +275,27 @@ 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 some of the changes were not emitted
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -282,8 +323,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -321,7 +382,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -353,11 +414,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 output '../outFile.tsbuildinfo' is older than input '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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -382,7 +448,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -407,16 +473,27 @@ 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 output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -444,9 +521,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 733
@@ -473,10 +549,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -507,16 +580,27 @@ 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 some of the changes were not emitted
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -544,8 +628,28 @@ 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",
+<<<<<<< HEAD
   "size": 713
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 673
+=======
+  "size": 710
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -588,7 +692,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -620,11 +724,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 output '../outFile.tsbuildinfo' is older than input '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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -649,7 +758,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 8156ce652f825..17282aff4f5fc 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
@@ -44,17 +44,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -82,26 +88,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 689
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -136,10 +135,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -168,12 +164,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -201,12 +208,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -230,10 +244,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -264,16 +275,27 @@ 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 some of the changes were not emitted
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -301,8 +323,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -340,7 +382,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -372,11 +414,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 output '../outFile.tsbuildinfo' is older than input '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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -401,7 +448,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -426,21 +473,27 @@ 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 output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[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'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -468,26 +521,17 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 685
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -511,10 +555,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -549,17 +590,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -588,21 +635,27 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 857
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 817
+=======
+  "size": 702
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -626,7 +679,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -662,10 +715,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -692,7 +745,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 f91f1f7fedf43..9ef4512f6dd4b 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
@@ -152,12 +152,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/projects/project/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,12 +196,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -214,10 +232,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -248,16 +263,27 @@ 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 some of the changes were not emitted
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -285,8 +311,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -324,7 +370,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -356,11 +402,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 output '../outFile.tsbuildinfo' is older than input '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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -385,7 +436,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -410,7 +461,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 output '../outFile.tsbuildinfo' is older than input 'a.ts'
+[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'...
 
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 6029e1635f5db..ed95df643c5d4 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
@@ -62,7 +62,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -184,7 +189,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -244,12 +254,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -284,10 +305,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 944
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 904
+=======
+  "size": 938
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -319,6 +352,40 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -370,17 +437,47 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] 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] 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.
 
 
 
-//// [/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
@@ -403,7 +500,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
@@ -412,7 +509,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -534,7 +636,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -592,12 +699,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -632,10 +750,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 935
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 895
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -654,6 +784,27 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/dev-build.d.ts] file written with same contents
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -705,17 +856,47 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] 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] 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,
+  "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:: dts errors
@@ -739,26 +920,27 @@ 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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -793,35 +975,19 @@ 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 | DtsEmit",
-    17
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1274
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1234
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -879,15 +1045,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -948,12 +1109,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -988,10 +1160,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 943
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
+=======
+  "size": 937
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -1033,6 +1217,50 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -1084,15 +1312,45 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] 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] 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.
+
+
+
 
 
-//// [/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 a4651069e4be8..c57f4be19af32 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -61,7 +61,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -152,7 +157,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -211,10 +221,16 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -260,6 +276,56 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -310,19 +376,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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: [
@@ -372,7 +438,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
@@ -381,25 +447,17 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
-//// [/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
-}
-
+//// [/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: [
@@ -459,7 +517,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -516,10 +579,16 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -552,6 +621,43 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/dev-build.d.ts] file written with same contents
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -602,19 +708,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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: [
@@ -665,39 +771,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/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
-}
-
+//// [/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: [
@@ -752,15 +840,10 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -820,10 +903,16 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -879,6 +968,66 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+//// [/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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -929,19 +1078,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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 5f482eb199d6a..2658289c04fa4 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -61,7 +61,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -181,7 +186,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -240,12 +250,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -279,10 +300,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 925
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 885
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -302,6 +335,28 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -352,17 +407,46 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] 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] 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
 
 Change:: semantic errors
@@ -385,7 +469,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
@@ -394,7 +478,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -514,7 +603,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -571,12 +665,23 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -610,10 +715,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 910
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -631,6 +748,26 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -681,16 +818,45 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
 
-[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[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] 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,
+  "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
 
-//// [/user/username/projects/dev-build.tsbuildinfo] file changed its modified time
+Semantic diagnostics in builder refreshed for::
 
+No shapes updated in the builder::
 
 exitCode:: ExitStatus.undefined
 
@@ -715,16 +881,27 @@ 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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -758,10 +935,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 926
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -785,6 +974,32 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -835,17 +1050,46 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] Project 'tsconfig.json' is out of date because buildinfo file '../dev-build.tsbuildinfo' indicates that program needs to report errors.
 
-[HH:MM:SS AM] Updating output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
+[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] Found 0 errors. Watching for file changes.
+4     "module": "amd",
+                ~~~~~
+
+[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
 
 Change:: Fix dts errors
@@ -869,16 +1113,27 @@ 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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -912,11 +1167,21 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 918
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
@@ -967,15 +1232,44 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[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] 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] 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.
 
 
 
-//// [/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 bde8eba2c9ebc..e5be942d5979c 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -60,7 +60,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -150,7 +155,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -208,10 +218,16 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -245,6 +261,44 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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.tsbuildinfo] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -294,18 +348,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
+
+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
-//// [/user/username/projects/dev-build.js] file changed its modified time
 
 
 Program root files: [
@@ -354,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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'...
 
@@ -363,25 +418,17 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
-//// [/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
-}
-
+//// [/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: [
@@ -440,7 +487,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -496,10 +548,16 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.tsbuildinfo]
 {"root":["./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"version":"FakeTSVersion"}
 
@@ -531,6 +589,42 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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.tsbuildinfo] file written with same contents
+//// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -580,18 +674,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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: [
@@ -641,16 +736,22 @@ 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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/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
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -674,6 +775,32 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -723,18 +850,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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: [
@@ -784,17 +912,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/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: [
@@ -844,18 +976,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 output '../dev-build.tsbuildinfo' is older than input 'src/main.ts'
+[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] Updating unchanged 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.
 
 
 
-//// [/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/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 740a45787cc9d..e584939dbbf99 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
@@ -110,7 +110,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
diff --git a/tests/baselines/reference/tsc/commandLine/help-all.js b/tests/baselines/reference/tsc/commandLine/help-all.js
index 870ed4a131e1d..c89ecbd5886a4 100644
--- a/tests/baselines/reference/tsc/commandLine/help-all.js
+++ b/tests/baselines/reference/tsc/commandLine/help-all.js
@@ -82,13 +82,13 @@ Conditions to set in addition to the resolver-specific defaults when resolving i
 
 --module, -m
 Specify what module code is generated.
-one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: commonjs, 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: classic, node10, node16, nodenext, bundler
-default: module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node`
+one of: node16, nodenext, bundler
+default: `nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`.
 
 --moduleSuffixes
 List of file name suffixes to search when resolving a module.
diff --git a/tests/baselines/reference/tsc/commandLine/help.js b/tests/baselines/reference/tsc/commandLine/help.js
index fcfab2360a32a..d879fe2516485 100644
--- a/tests/baselines/reference/tsc/commandLine/help.js
+++ b/tests/baselines/reference/tsc/commandLine/help.js
@@ -109,7 +109,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
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 3428608471470..fa9c317c8d314 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
@@ -110,7 +110,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
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 3428608471470..fa9c317c8d314 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
@@ -110,7 +110,7 @@ default: es5
 
 --module, -m
 Specify what module code is generated.
-one of: none, commonjs, amd, umd, system, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
+one of: commonjs, es6/es2015, es2020, es2022, esnext, node16, node18, node20, nodenext, preserve
 default: undefined
 
 --lib
diff --git a/tests/baselines/reference/tsc/composite/converting-to-modules.js b/tests/baselines/reference/tsc/composite/converting-to-modules.js
index cb784609d7527..a3dac335c0729 100644
--- a/tests/baselines/reference/tsc/composite/converting-to-modules.js
+++ b/tests/baselines/reference/tsc/composite/converting-to-modules.js
@@ -29,6 +29,14 @@ 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]
@@ -40,7 +48,13 @@ declare const x = 10;
 
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./src/main.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -79,13 +93,29 @@ 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",
+<<<<<<< HEAD
   "size": 788
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 748
+=======
+  "size": 783
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 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 800c368245338..72699d5989a09 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
@@ -51,6 +51,11 @@ 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
@@ -60,8 +65,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in src/index.ts:2
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/index.ts:2
+     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
@@ -74,7 +82,13 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -101,6 +115,20 @@ 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",
@@ -116,7 +144,13 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1132
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1092
+=======
+  "size": 1129
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -133,6 +167,11 @@ 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
@@ -140,8 +179,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in src/index.ts:2
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/index.ts:2
+     1  tsconfig.json:3
 
 
 
@@ -165,6 +207,11 @@ 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
@@ -172,7 +219,7 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error.
+Found 2 errors.
 
 
 
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 11af8a0fc70bf..9ea752951d598 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
@@ -50,6 +50,11 @@ 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'
@@ -58,8 +63,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in src/index.ts:2
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/index.ts:2
+     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js]
@@ -85,6 +93,11 @@ 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'
@@ -93,8 +106,11 @@ ky.d.ts
 src/index.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in src/index.ts:2
+Found 2 errors in 2 files.
 
+Errors  Files
+     1  src/index.ts:2
+     1  tsconfig.json:3
 
 
 //// [/home/src/workspaces/project/outFile.js] file written with same contents
@@ -119,6 +135,11 @@ 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
@@ -130,7 +151,7 @@ src/index.ts
 [HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/workspaces/project/tsconfig.json'...
 
 
-Found 1 error.
+Found 2 errors.
 
 
 
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 eb3721ec64f26..17bd25aadb4bd 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
@@ -39,6 +39,14 @@ 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]
@@ -71,7 +79,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -107,8 +121,36 @@ 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",
+<<<<<<< HEAD
   "size": 882
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 842
+=======
+  "size": 883
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -132,16 +174,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with sourceMap
 
@@ -149,6 +186,14 @@ 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]
@@ -181,7 +226,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,8 +269,36 @@ 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",
+<<<<<<< HEAD
   "size": 899
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 859
+=======
+  "size": 900
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -247,11 +326,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -259,6 +338,14 @@ 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]
@@ -291,7 +378,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -327,8 +420,36 @@ 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",
+<<<<<<< HEAD
   "size": 882
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 842
+=======
+  "size": 883
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -352,11 +473,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration, emit Dts and should not emit js
 
@@ -364,10 +485,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -404,8 +539,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 901
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 861
+=======
+  "size": 902
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -445,11 +608,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration and declarationMap
 
@@ -457,10 +620,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -498,8 +675,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 923
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 883
+=======
+  "size": 924
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -543,11 +748,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -555,6 +760,14 @@ 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
+
 
 
 
@@ -578,11 +791,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: local change
 
@@ -593,6 +806,14 @@ 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]
@@ -625,7 +846,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -661,8 +888,36 @@ 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",
+<<<<<<< HEAD
   "size": 883
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 843
+=======
+  "size": 884
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -686,16 +941,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration and declarationMap
 
@@ -703,10 +953,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -744,8 +1008,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 925
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -773,11 +1065,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -785,6 +1077,14 @@ 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
+
 
 
 
@@ -808,11 +1108,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with inlineSourceMap
 
@@ -820,6 +1120,14 @@ 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]
@@ -852,7 +1160,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -889,8 +1203,36 @@ 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",
+<<<<<<< HEAD
   "size": 906
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 866
+=======
+  "size": 907
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -915,11 +1257,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with sourceMap
 
@@ -927,6 +1269,14 @@ 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]
@@ -959,7 +1309,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -996,8 +1352,36 @@ 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",
+<<<<<<< HEAD
   "size": 900
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 860
+=======
+  "size": 901
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1025,11 +1409,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: emit js files
 
@@ -1037,6 +1421,14 @@ 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]
@@ -1069,7 +1461,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1105,8 +1503,36 @@ 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",
+<<<<<<< HEAD
   "size": 883
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 843
+=======
+  "size": 884
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1130,11 +1556,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration and declarationMap
 
@@ -1142,10 +1568,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1183,8 +1623,36 @@ 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"
+    ],
+    [
+      "./project/c.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./project/d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 925
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1212,11 +1680,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration and declarationMap, should not re-emit
 
@@ -1224,6 +1692,14 @@ 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
+
 
 
 
@@ -1249,8 +1725,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options.js b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
index 368b6d14ba0ca..402ae9bfc7213 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
@@ -39,6 +39,14 @@ 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]
@@ -86,7 +94,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -123,10 +137,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -150,16 +192,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with sourceMap
 
@@ -167,6 +204,14 @@ 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]
@@ -199,7 +244,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -237,10 +288,38 @@ 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",
+<<<<<<< HEAD
   "size": 1199
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1159
+=======
+  "size": 1200
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -268,11 +347,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: should re-emit only js so they dont contain sourcemap
 
@@ -280,6 +359,14 @@ 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]
@@ -312,7 +399,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -349,10 +442,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -376,11 +497,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration should not emit anything
 
@@ -388,6 +509,14 @@ 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
+
 
 
 
@@ -412,11 +541,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -424,6 +553,14 @@ 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
+
 
 
 
@@ -447,11 +584,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration and declarationMap
 
@@ -459,6 +596,14 @@ 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]
@@ -477,7 +622,13 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -516,10 +667,38 @@ 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",
+<<<<<<< HEAD
   "size": 1223
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1183
+=======
+  "size": 1224
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -548,11 +727,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: should re-emit only dts so they dont contain sourcemap
 
@@ -560,6 +739,14 @@ 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]
@@ -578,7 +765,13 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -615,10 +808,38 @@ 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",
+<<<<<<< HEAD
   "size": 1182
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1142
+=======
+  "size": 1183
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -642,11 +863,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with emitDeclarationOnly should not emit anything
 
@@ -654,6 +875,14 @@ 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
+
 
 
 
@@ -678,11 +907,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -690,6 +919,14 @@ 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
+
 
 
 
@@ -713,11 +950,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: local change
 
@@ -728,6 +965,14 @@ 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]
@@ -760,7 +1005,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -797,10 +1048,38 @@ 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",
+<<<<<<< HEAD
   "size": 1183
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1143
+=======
+  "size": 1184
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -824,16 +1103,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with declaration should not emit anything
 
@@ -841,6 +1115,14 @@ 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
+
 
 
 
@@ -865,11 +1147,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with inlineSourceMap
 
@@ -877,6 +1159,14 @@ 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]
@@ -909,7 +1199,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -947,10 +1243,38 @@ 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",
+<<<<<<< HEAD
   "size": 1206
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1166
+=======
+  "size": 1207
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -975,11 +1299,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with sourceMap
 
@@ -987,6 +1311,14 @@ 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]
@@ -1019,7 +1351,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1057,10 +1395,38 @@ 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",
+<<<<<<< HEAD
   "size": 1200
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1160
+=======
+  "size": 1201
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1088,11 +1454,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: declarationMap enabling
 
@@ -1110,6 +1476,14 @@ 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]
@@ -1157,7 +1531,13 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1195,10 +1575,38 @@ 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",
+<<<<<<< HEAD
   "size": 1205
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1165
+=======
+  "size": 1206
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map] file written with same contents
@@ -1224,11 +1632,11 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: with sourceMap should not emit d.ts
 
@@ -1236,6 +1644,14 @@ 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]
@@ -1268,7 +1684,13 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1307,10 +1729,38 @@ 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",
+<<<<<<< HEAD
   "size": 1222
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1182
+=======
+  "size": 1223
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js.map] file written with same contents
@@ -1337,8 +1787,8 @@ Program files::
 /home/src/workspaces/project/c.ts
 /home/src/workspaces/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
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 b0ade0bb0b499..dd8ff261d4906 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,6 +1,7 @@
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -60,4 +61,68 @@ IncrementalBuild:
   "latestChangedDtsFile": "FakeFileName",
   "errors": true,
   "version": "FakeTSVersion"
-}
\ No newline at end of file
+}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 358e2c6640577..6acd0d9e16678 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
@@ -51,6 +51,14 @@ 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]
@@ -64,6 +72,7 @@ declare class class2 {
 
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
@@ -329,6 +338,8 @@ 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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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]
 {
@@ -340,11 +351,11 @@ Found 1 error.
   "fileInfos": {
     "../../../tslibs/ts/lib/lib.d.ts": {
       "original": {
-        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "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": {
@@ -377,25 +388,101 @@ Found 1 error.
     "composite": true,
     "module": 0
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "../project1/class1.d.ts",
-      "not cached or not changed"
-    ],
+  "latestChangedDtsFile": "./class2.d.ts",
+  "version": "FakeTSVersion",
+  "size": 854
+}
+
+
+exitCode:: ExitStatus.Success
+
+Change:: Add class3 to project1 and build it
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.ts]
+class class3 {}
+
+
+/home/src/tslibs/TS/Lib/tsc.js -i -p project2
+Output::
+error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
+  The file is in the program because:
+    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
+
+  project2/tsconfig.json:7:5
+    7     {
+          ~
+    8       "path": "../project1"
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    9     }
+      ~~~~~
+    File is output from referenced project specified here.
+
+
+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": [
     [
-      "./class2.ts",
-      "not cached or not changed"
+      3,
+      "./class2.ts"
     ]
   ],
+  "options": {
+    "composite": true,
+    "module": 0
+  },
   "latestChangedDtsFile": "./class2.d.ts",
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 929
+  "size": 868
 }
 
 
 exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
-Change:: Create output for class3
+Change:: Add output of class3
 
 Input::
 //// [/home/src/workspaces/projects/project1/class3.d.ts]
@@ -408,7 +495,7 @@ Output::
 
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+{"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]
 {
@@ -421,11 +508,11 @@ Output::
   "fileInfos": {
     "../../../tslibs/ts/lib/lib.d.ts": {
       "original": {
-        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+        "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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
+      "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": {
@@ -469,8 +556,513 @@ Output::
   },
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 996
+  "size": 956
 }
 
 
 exitCode:: ExitStatus.Success
+
+Change:: Add excluded file to project1
+
+Input::
+//// [/home/src/workspaces/projects/project1/temp/file.d.ts]
+declare class file {}
+
+
+/home/src/tslibs/TS/Lib/tsc.js -i -p project2
+Output::
+
+
+
+exitCode:: ExitStatus.Success
+
+Change:: Delete output for class3
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.d.ts] deleted
+
+/home/src/tslibs/TS/Lib/tsc.js -i -p project2
+Output::
+error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
+  The file is in the program because:
+    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
+
+  project2/tsconfig.json:7:5
+    7     {
+          ~
+    8       "path": "../project1"
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    9     }
+      ~~~~~
+    File is output from referenced project specified here.
+
+
+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":[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":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+//// [/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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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
+  },
+  "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",
+<<<<<<< HEAD
+  "size": 929
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 889
+=======
+  "size": 891
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+}
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+
+Change:: Add class3 to project1 and build it
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.ts]
+class class3 {}
+
+
+/home/src/tslibs/TS/Lib/tsc.js -i -p project2
+Output::
+error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
+  The file is in the program because:
+    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
+
+  project2/tsconfig.json:7:5
+    7     {
+          ~
+    8       "path": "../project1"
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    9     }
+      ~~~~~
+    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
+
+
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+
+Change:: Add output of class3
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.d.ts]
+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]
+<<<<<<< HEAD
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+//// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "../project1/class1.d.ts",
+    "../project1/class3.d.ts",
+    "./class2.ts"
+  ],
+  "fileInfos": {
+    "../../../tslibs/ts/lib/lib.d.ts": {
+      "original": {
+        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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
+    },
+    "../project1/class3.d.ts": {
+      "original": {
+        "version": "-3469165364-declare class class3 {}",
+        "affectsGlobalScope": true
+      },
+      "version": "-3469165364-declare class class3 {}",
+      "signature": "-3469165364-declare class class3 {}",
+      "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": [
+    [
+      4,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "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",
+<<<<<<< HEAD
+  "size": 996
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 956
+=======
+  "size": 995
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+}
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+
+Change:: Add excluded file to project1
+
+Input::
+//// [/home/src/workspaces/projects/project1/temp/file.d.ts]
+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
+
+Change:: Delete output for class3
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.d.ts] deleted
+
+/home/src/tslibs/TS/Lib/tsc.js -i -p project2
+Output::
+error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
+  The file is in the program because:
+    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
+
+  project2/tsconfig.json:7:5
+    7     {
+          ~
+    8       "path": "../project1"
+      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    9     }
+      ~~~~~
+    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
+
+
+
+//// [/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"}
+
+//// [/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
+  },
+  "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
+}
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+
+Change:: Create output for class3
+
+Input::
+//// [/home/src/workspaces/projects/project1/class3.d.ts]
+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"}
+
+//// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
+{
+  "fileNames": [
+    "../../../tslibs/ts/lib/lib.d.ts",
+    "../project1/class1.d.ts",
+    "../project1/class3.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
+    },
+    "../project1/class3.d.ts": {
+      "original": {
+        "version": "-3469165364-declare class class3 {}",
+        "affectsGlobalScope": true
+      },
+      "version": "-3469165364-declare class class3 {}",
+      "signature": "-3469165364-declare class class3 {}",
+      "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": [
+    [
+      4,
+      "./class2.ts"
+    ]
+  ],
+  "options": {
+    "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
+}
+
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
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 bb5f6b4f1dfe1..c0e5bb509eb0a 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,6 +1,7 @@
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -51,9 +52,64 @@ IncrementalBuild:
   },
   "version": "FakeTSVersion"
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -111,4 +167,66 @@ IncrementalBuild:
     "outFile": "./outFile.js"
   },
   "version": "FakeTSVersion"
-}
\ No newline at end of file
+}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 9c64cf0fa7461..54c4154d91714 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
@@ -44,9 +44,17 @@ 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.
 
-Found 1 error in a.ts:1
+5     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -182,9 +190,17 @@ 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
 
 
 
@@ -221,6 +237,14 @@ 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]
@@ -319,7 +343,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -327,6 +351,14 @@ 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
+
 
 
 
@@ -352,7 +384,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -360,10 +392,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -392,8 +438,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -414,14 +480,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -429,6 +492,14 @@ 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
+
 
 
 
@@ -449,11 +520,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -461,7 +532,64 @@ 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: [
@@ -482,11 +610,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -507,9 +635,17 @@ 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]
@@ -645,9 +781,17 @@ 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.
 
-Found 1 error in a.ts:1
+5     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:5
 
 
 
@@ -691,13 +835,27 @@ 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.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -726,6 +884,20 @@ Found 1 error in a.ts: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"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -750,7 +922,13 @@ Found 1 error in a.ts:1
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -771,10 +949,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -789,6 +964,14 @@ 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]
@@ -879,7 +1062,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -887,10 +1070,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -919,8 +1116,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -941,14 +1158,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -959,13 +1173,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -991,7 +1205,13 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1026,21 +1246,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1075,11 +1305,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1104,9 +1330,17 @@ 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.
 
-Found 1 error in a.ts:1
+5     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -1252,6 +1486,14 @@ 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]
@@ -1359,7 +1601,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1367,18 +1609,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1413,21 +1661,31 @@ Found 1 error in c.ts:1
     "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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1450,11 +1708,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1466,8 +1720,74 @@ 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",
@@ -1489,11 +1809,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1501,16 +1821,73 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+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],"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",
@@ -1531,7 +1908,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 30b071a37bc69..e4812dc333290 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/dts-errors.js
@@ -43,9 +43,17 @@ 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.
 
-Found 1 error in a.ts:1
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  a.ts:1
+     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.js]
@@ -104,9 +112,17 @@ 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
@@ -139,6 +155,14 @@ 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]
@@ -183,7 +207,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -191,6 +215,14 @@ 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
@@ -213,7 +245,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -221,6 +253,14 @@ 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
@@ -242,7 +282,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -250,6 +290,14 @@ 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
@@ -271,7 +319,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -279,6 +327,14 @@ 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
@@ -301,7 +357,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -322,9 +378,17 @@ 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]
@@ -383,9 +447,17 @@ 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
@@ -425,9 +497,17 @@ 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
@@ -459,6 +539,14 @@ 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]
@@ -495,7 +583,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -503,6 +591,14 @@ 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
@@ -524,7 +620,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -535,13 +631,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -618,9 +714,17 @@ 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]
@@ -680,6 +784,14 @@ 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]
@@ -724,7 +836,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -732,13 +844,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -771,6 +883,14 @@ 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
@@ -795,7 +915,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -803,13 +923,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
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 bb5f6b4f1dfe1..c0e5bb509eb0a 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,6 +1,7 @@
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -51,9 +52,64 @@ IncrementalBuild:
   },
   "version": "FakeTSVersion"
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -111,4 +167,66 @@ IncrementalBuild:
     "outFile": "./outFile.js"
   },
   "version": "FakeTSVersion"
-}
\ No newline at end of file
+}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 9a870cf440a53..80afd23c063e7 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
@@ -34,6 +34,14 @@ 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]
@@ -132,7 +140,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -140,6 +148,14 @@ 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
+
 
 
 
@@ -165,7 +181,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Fix `a` error with noCheck
 
@@ -176,6 +192,14 @@ 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
@@ -260,7 +284,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -268,6 +292,14 @@ 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
+
 
 
 
@@ -293,7 +325,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -301,10 +333,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -333,8 +379,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -355,14 +421,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -370,6 +433,14 @@ 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
+
 
 
 
@@ -390,11 +461,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -402,7 +473,64 @@ 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: [
@@ -423,11 +551,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -438,6 +566,14 @@ 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
@@ -522,7 +658,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -530,6 +666,14 @@ 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
+
 
 
 
@@ -555,7 +699,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -563,18 +707,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const a: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -604,21 +754,27 @@ Found 1 error in a.ts:1
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 722
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -639,10 +795,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -657,6 +810,14 @@ 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
@@ -741,7 +902,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -749,10 +910,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -781,8 +956,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -803,14 +998,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -821,13 +1013,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -865,7 +1057,13 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -900,21 +1098,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -937,11 +1145,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -956,6 +1160,14 @@ 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
@@ -1054,7 +1266,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Fix `a` error with noCheck
 
@@ -1065,6 +1277,14 @@ 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
@@ -1163,7 +1383,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1171,18 +1391,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1217,21 +1443,31 @@ Found 1 error in c.ts:1
     "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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1254,11 +1490,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1270,7 +1502,73 @@ 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: [
@@ -1293,11 +1591,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1305,16 +1603,73 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+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],"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",
@@ -1335,7 +1690,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 ce4f61af3a1f6..a659d55f6fd99 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/semantic-errors.js
@@ -33,6 +33,14 @@ 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]
@@ -77,7 +85,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -85,6 +93,14 @@ 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
@@ -107,7 +123,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Fix `a` error with noCheck
 
@@ -118,6 +134,14 @@ 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
@@ -148,7 +172,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -156,6 +180,14 @@ 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
@@ -178,7 +210,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -186,6 +218,14 @@ 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
@@ -207,7 +247,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -215,6 +255,14 @@ 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
@@ -236,7 +284,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -244,6 +292,14 @@ 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
@@ -266,7 +322,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -277,6 +333,14 @@ 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
@@ -307,7 +371,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -315,6 +379,14 @@ 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
@@ -337,7 +409,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -345,13 +417,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -385,6 +457,14 @@ 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
@@ -415,7 +495,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -423,6 +503,14 @@ 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
@@ -444,7 +532,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -455,13 +543,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -528,6 +616,14 @@ 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
@@ -563,7 +659,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Fix `a` error with noCheck
 
@@ -574,6 +670,14 @@ 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
@@ -609,7 +713,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -617,13 +721,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -656,6 +760,14 @@ 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
@@ -680,7 +792,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -688,13 +800,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
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 bb5f6b4f1dfe1..c0e5bb509eb0a 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,6 +1,7 @@
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -51,9 +52,64 @@ IncrementalBuild:
   },
   "version": "FakeTSVersion"
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
+<<<<<<< HEAD
 TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
 CleanBuild:
 {
@@ -111,4 +167,66 @@ IncrementalBuild:
     "outFile": "./outFile.js"
   },
   "version": "FakeTSVersion"
-}
\ No newline at end of file
+}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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"
+}
+=======
+*** Supplied discrepancy explanation but didnt find any difference
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 3e32ab903aefa..9c68724646388 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
@@ -192,6 +192,14 @@ 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]
@@ -282,7 +290,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -290,6 +298,14 @@ 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
+
 
 
 
@@ -315,7 +331,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -323,10 +339,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -355,8 +385,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -377,14 +427,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -392,6 +439,14 @@ 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
+
 
 
 
@@ -412,11 +467,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -424,7 +479,64 @@ 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: [
@@ -445,11 +557,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -698,6 +810,14 @@ 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]
@@ -788,7 +908,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -796,10 +916,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -828,8 +962,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -850,14 +1004,11 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -868,13 +1019,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -912,7 +1063,13 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -947,21 +1104,31 @@ 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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -984,11 +1151,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1129,6 +1292,14 @@ 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]
@@ -1236,7 +1407,7 @@ No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1244,18 +1415,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1290,21 +1467,31 @@ Found 1 error in c.ts:1
     "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",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 938
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 898
+=======
+  "size": 785
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1327,11 +1514,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1343,7 +1526,73 @@ 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: [
@@ -1366,11 +1615,11 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -1378,16 +1627,73 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:5:15 - 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 export const c: number = "hello";
-               ~
+5     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+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],"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",
@@ -1408,7 +1714,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 da470f888d8c2..a77c7b493a4f5 100644
--- a/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noCheck/outFile/syntax-errors.js
@@ -134,6 +134,14 @@ 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]
@@ -170,7 +178,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -178,6 +186,14 @@ 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
@@ -200,7 +216,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -208,6 +224,14 @@ 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
@@ -229,7 +253,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -237,6 +261,14 @@ 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
@@ -258,7 +290,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -266,6 +298,14 @@ 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
@@ -288,7 +328,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Introduce error with noCheck
 
@@ -429,6 +469,14 @@ 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]
@@ -465,7 +513,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -473,6 +521,14 @@ 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
@@ -494,7 +550,7 @@ Program files::
 /home/src/workspaces/project/a.ts
 /home/src/workspaces/project/b.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Add file with error
 
@@ -505,13 +561,13 @@ export const c: number = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -641,6 +697,14 @@ 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]
@@ -685,7 +749,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -693,13 +757,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -732,6 +796,14 @@ 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
@@ -756,7 +828,7 @@ Program files::
 /home/src/workspaces/project/b.ts
 /home/src/workspaces/project/c.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with checking
 
@@ -764,13 +836,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-c.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const c: number = "hello";
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in c.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
index 37aca5b500d61..81d3a68005afc 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
@@ -54,13 +54,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -129,7 +129,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -173,24 +179,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -202,10 +229,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -213,10 +248,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -229,36 +272,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -301,73 +332,19 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2653
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2613
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -384,19 +361,25 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -440,24 +423,45 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -469,13 +473,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -488,10 +492,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -499,10 +511,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -510,13 +530,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -534,38 +554,14 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:5
 
-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]
@@ -633,7 +629,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -677,68 +679,45 @@ 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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2635
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2595
+=======
+  "size": 1849
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -750,38 +729,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:5
 
-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
 
 
 
@@ -793,32 +748,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 
@@ -830,32 +767,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:5
 
-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
 
 
 
@@ -867,38 +786,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 3 errors in 3 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
-     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -915,10 +810,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -961,33 +870,23 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2074
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2034
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -995,13 +894,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -1070,7 +969,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1114,24 +1019,45 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1143,10 +1069,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1154,10 +1088,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1165,13 +1107,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
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 f897509715922..422d25bf0081d 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
@@ -55,13 +55,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
@@ -130,7 +130,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -174,22 +180,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -201,10 +228,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -212,10 +247,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -228,36 +271,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:6
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -300,71 +331,17 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2104
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2064
+=======
+  "size": 1273
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -381,20 +358,26 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
 //// [/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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -438,22 +421,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -465,13 +469,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
@@ -484,10 +488,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -495,10 +507,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -506,13 +526,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
@@ -530,38 +550,14 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+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.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+6     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:6
 
-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]
@@ -629,7 +625,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -673,66 +675,43 @@ 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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2084
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2044
+=======
+  "size": 1298
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -744,38 +723,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+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.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+6     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:6
 
-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
 
 
 
@@ -787,32 +742,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+6     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:6
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 
@@ -824,32 +761,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+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.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+6     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:6
 
-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
 
 
 
@@ -861,38 +780,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 3 errors in 3 files.
+Found 1 error in tsconfig.json:6
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
-     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -909,10 +804,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -955,31 +864,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1271
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -987,13 +886,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
@@ -1062,7 +961,13 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1106,22 +1011,43 @@ 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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1133,10 +1059,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1144,10 +1078,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1155,13 +1097,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
index f4eb725a3a218..fc13f12fc20ff 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
@@ -54,13 +54,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -109,7 +109,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -152,22 +158,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -179,10 +206,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -190,10 +225,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error but still noEmit
 
@@ -206,36 +249,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -277,71 +308,17 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2085
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2045
+=======
+  "size": 1254
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -358,19 +335,25 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -413,22 +396,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -440,13 +444,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -459,10 +463,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -470,10 +482,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -481,13 +501,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -505,38 +525,14 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:5
 
-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]
@@ -584,7 +580,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -627,66 +629,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2065
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2025
+=======
+  "size": 1279
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -698,38 +677,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:5
 
-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
 
 
 
@@ -741,32 +696,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-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;
-                             ~~~~
+tsconfig.json:5:15 - 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/class.ts:2:5
-    2     prop1 = 1;
-          ~~~~~
-    'prop1' is declared here.
+5     "module": "amd"
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
 
 
 
@@ -778,32 +715,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p . --noEmit
 Output::
-src/directUse.ts:2:28 - error TS2551: Property 'prop' does not exist on type 'classC'. Did you mean 'prop1'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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'?
+Found 1 error in tsconfig.json:5
 
-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
 
 
 
@@ -815,38 +734,14 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 3 errors in 3 files.
+Found 1 error in tsconfig.json:5
 
-Errors  Files
-     1  src/directUse.ts:2
-     1  src/indirectUse.ts:2
-     1  src/noChangeFileWithEmitSpecificError.ts:1
 
 
 
@@ -863,10 +758,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -908,31 +817,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1252
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -940,13 +839,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
@@ -995,7 +894,13 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1038,22 +943,43 @@ function someFunc(arguments, ...rest) {
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1065,10 +991,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with noEmit
 
@@ -1076,10 +1010,18 @@ 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.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: No Change run with emit
 
@@ -1087,13 +1029,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
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 241bfb0a64eac..d949d14495608 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
@@ -54,10 +54,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -100,31 +114,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1521
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1481
+=======
+  "size": 1281
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -132,18 +142,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -187,24 +203,45 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -285,42 +322,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:5
 
-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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -364,68 +383,45 @@ Errors  Files
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2635
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2595
+=======
+  "size": 1849
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -506,10 +502,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -552,33 +562,23 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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"
-        }
-      ]
-    ]
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "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",
+<<<<<<< HEAD
   "size": 2074
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2034
+=======
+  "size": 1822
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -586,18 +586,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -641,24 +647,45 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "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",
+<<<<<<< HEAD
   "size": 2055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2015
+=======
+  "size": 1845
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 0121b5de73bd2..5812c39b84c40 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
@@ -55,10 +55,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -101,31 +115,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1283
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -133,18 +143,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -188,22 +204,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -284,42 +321,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+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.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+6     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:6
 
-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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -363,66 +382,43 @@ Errors  Files
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2084
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2044
+=======
+  "size": 1298
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -503,10 +499,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -549,31 +559,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1523
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1483
+=======
+  "size": 1271
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -581,18 +581,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+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.
 
-1 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+6     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:6
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -636,22 +642,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1506
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1466
+=======
+  "size": 1296
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 ddc7db65891af..063d6825e4733 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
@@ -54,10 +54,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -99,31 +113,27 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "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"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1264
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -131,18 +141,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,22 +201,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -261,42 +298,24 @@ export class classC {
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-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'?
+tsconfig.json:5:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-2 new indirectClass().classC.prop;
-                             ~~~~
+5     "module": "amd"
+                ~~~~~
 
-  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.
+Found 1 error in tsconfig.json:5
 
-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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -339,66 +358,43 @@ Errors  Files
     "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",
-      [
-        {
-          "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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
     ],
     [
       "./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
-            }
-          ]
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/src/nochangefile.ts",
+      "not cached or not changed"
     ],
     [
       "./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"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 2065
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 2025
+=======
+  "size": 1279
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -459,10 +455,24 @@ 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]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -504,31 +514,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 1252
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No Change run with emit
 
@@ -536,18 +536,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js --p .
 Output::
-src/noChangeFileWithEmitSpecificError.ts:1:19 - error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
+tsconfig.json:5:15 - 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 function someFunc(arguments: boolean, ...rest: any[]) {
-                    ~~~~~~~~~~~~~~~~~~
+5     "module": "amd"
+                ~~~~~
 
 
-Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
+Found 1 error in tsconfig.json:5
 
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -590,22 +596,43 @@ Found 1 error in src/noChangeFileWithEmitSpecificError.ts:1
     "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",
-      [
-        {
-          "start": 18,
-          "length": 18,
-          "messageText": "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.",
-          "category": 1,
-          "code": 2396,
-          "skippedOn": "noEmit"
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1487
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1447
+=======
+  "size": 1277
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 b94744cbaaa49..9fd1cba970c4d 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
@@ -39,10 +39,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -78,12 +92,21 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 885
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 845
+=======
+  "size": 853
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -109,16 +132,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -126,6 +144,14 @@ 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
+
 
 
 
@@ -151,11 +177,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: With declaration enabled noEmit - Should report errors
 
@@ -163,47 +189,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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 in tsconfig.json:4
 
-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 in 3 files.
-
-Errors  Files
-     1  a.ts:1
-     1  c.ts:1
-     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -240,77 +243,21 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1765
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1725
+=======
+  "size": 872
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -337,7 +284,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -349,47 +296,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 3 errors in 3 files.
+Found 1 error in tsconfig.json:4
 
-Errors  Files
-     1  a.ts:1
-     1  c.ts:1
-     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -427,77 +351,21 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "./project/c.ts",
+    "./project/d.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1787
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1747
+=======
+  "size": 894
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -525,7 +393,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -537,6 +405,14 @@ 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
+
 
 
 
@@ -562,11 +438,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Dts Emit with error
 
@@ -604,17 +480,29 @@ 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 3 errors in 3 files.
+
+Found 4 errors in 4 files.
 
 Errors  Files
      1  a.ts:1
      1  c.ts:1
      1  d.ts:1
+     1  tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -651,6 +539,28 @@ 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",
@@ -717,7 +627,13 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1748
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1708
+=======
+  "size": 1749
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -785,7 +701,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -800,10 +716,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -839,9 +769,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 884
@@ -870,16 +799,11 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: With declaration enabled noEmit
 
@@ -887,36 +811,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration
 Output::
-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.
-
-1 export const d = class { private p = 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.
 
-  d.ts:1:14
-    1 export const d = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable d.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:4
 
-Errors  Files
-     1  c.ts:1
-     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -953,56 +865,17 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1485
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1445
+=======
+  "size": 863
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1029,7 +902,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1041,36 +914,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-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.
-
-1 export const d = class { private p = 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.
 
-  d.ts:1:14
-    1 export const d = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable d.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 2 errors in 2 files.
+Found 1 error in tsconfig.json:4
 
-Errors  Files
-     1  c.ts:1
-     1  d.ts:1
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1108,56 +969,17 @@ Errors  Files
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1507
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1467
+=======
+  "size": 885
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1185,7 +1007,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -1200,23 +1022,24 @@ export const c = class { public p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit --declaration --declarationMap
 Output::
-d.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in d.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1254,35 +1077,18 @@ Found 1 error in d.ts:1
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/c.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1227
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1187
+=======
+  "size": 886
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -1310,12 +1116,7 @@ Program files::
 /home/src/projects/project/c.ts
 /home/src/projects/project/d.ts
 
-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 cached semantic diagnostics in the builder::
 
 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
new file mode 100644
index 0000000000000..c31c43cffeb6f
--- /dev/null
+++ b/tests/baselines/reference/tsc/noEmit/outFile/dts-errors-with-incremental-as-modules-discrepancies.js
@@ -0,0 +1,103 @@
+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 8633cb6a2c393..12185c238fd28 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
@@ -34,23 +34,24 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -79,35 +80,19 @@ Found 1 error in a.ts:1
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 716
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -130,10 +115,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -145,18 +127,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -180,7 +157,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -195,10 +172,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -227,12 +218,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 734
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 694
+=======
+  "size": 701
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -255,14 +253,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -270,6 +265,14 @@ 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
+
 
 
 
@@ -292,11 +295,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -304,10 +307,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -336,8 +353,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -383,11 +420,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -395,6 +432,14 @@ 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
+
 
 
 
@@ -417,11 +462,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -432,23 +477,24 @@ export const a = class { private p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -477,35 +523,17 @@ Found 1 error in a.ts:1
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 712
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -528,10 +556,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -553,13 +578,27 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -588,6 +627,20 @@ Found 1 error in a.ts: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"
+    ]
+  ],
   "emitDiagnosticsPerFile": [
     [
       "./project/a.ts",
@@ -612,7 +665,13 @@ Found 1 error in a.ts:1
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -654,7 +713,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -666,18 +725,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -701,7 +755,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 2708b0bbeefdf..531a925b545ef 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
@@ -33,10 +33,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -64,12 +78,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 733
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 693
+=======
+  "size": 697
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -91,14 +112,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -106,6 +124,14 @@ 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
+
 
 
 
@@ -127,11 +153,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -142,10 +168,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -173,12 +213,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -200,14 +247,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -215,6 +259,14 @@ 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
+
 
 
 
@@ -236,11 +288,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -248,10 +300,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -279,8 +345,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -316,11 +402,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -328,6 +414,14 @@ 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
+
 
 
 
@@ -349,11 +443,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -364,10 +458,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -395,9 +503,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 733
@@ -422,14 +529,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: Emit when error
 
@@ -437,10 +541,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -468,8 +586,28 @@ 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",
+<<<<<<< HEAD
   "size": 713
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 673
+=======
+  "size": 710
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -510,11 +648,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -522,6 +660,14 @@ 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
+
 
 
 
@@ -543,8 +689,8 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 f2f8e4fba1fc4..5b1e7be91b84f 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
@@ -33,18 +33,24 @@ export const b = 10;
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -72,26 +78,19 @@ Found 1 error in a.ts:1
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 689
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -113,10 +112,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -128,13 +124,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -157,7 +153,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -172,10 +168,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -203,12 +213,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -230,14 +247,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -245,6 +259,14 @@ 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
+
 
 
 
@@ -266,11 +288,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -278,10 +300,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -309,8 +345,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -346,11 +402,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -358,6 +414,14 @@ 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
+
 
 
 
@@ -379,11 +443,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Introduce error
 
@@ -394,18 +458,24 @@ export const a: number = "hello"
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -433,26 +503,17 @@ Found 1 error in a.ts:1
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 685
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -474,10 +535,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -489,18 +547,24 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p .
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -529,21 +593,27 @@ Found 1 error in a.ts:1
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 857
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 817
+=======
+  "size": 702
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -565,7 +635,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -577,13 +647,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js -p . --noEmit
 Output::
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in a.ts:1
+Found 1 error in tsconfig.json:4
 
 
 
@@ -606,7 +676,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 855caa7f8a65d..09dfd4fe57533 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
@@ -156,10 +156,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -187,12 +201,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -214,14 +235,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -229,6 +247,14 @@ 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
+
 
 
 
@@ -250,11 +276,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Emit after fixing error
 
@@ -262,10 +288,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -293,8 +333,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -330,11 +390,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: no-change-run
 
@@ -342,6 +402,14 @@ 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
+
 
 
 
@@ -363,11 +431,11 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 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 8c97a3b57163c..f6b3c1da95e16 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
@@ -45,23 +45,24 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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 src/main.ts:2
+Found 1 error in tsconfig.json:4
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -96,35 +97,19 @@ Found 1 error in src/main.ts:2
     "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 | DtsEmit",
-    17
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1274
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1234
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -164,18 +149,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in src/main.ts:2
+Found 1 error in tsconfig.json:4
 
 
 
@@ -217,10 +197,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -255,10 +249,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 943
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
+=======
+  "size": 937
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -300,6 +306,50 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -329,7 +379,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -337,6 +387,14 @@ 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
+
 
 
 
@@ -364,4 +422,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 fc869587f118b..6faf8d1107cab 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
@@ -44,18 +44,13 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-src/main.ts:2:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
-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 src/main.ts:2
+Found 1 error in tsconfig.json:4
 
 
 
@@ -87,18 +82,13 @@ Input::
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 
-Found 1 error in src/main.ts:2
+Found 1 error in tsconfig.json:4
 
 
 
@@ -135,6 +125,7 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -176,6 +167,58 @@ declare module "src/main" {
 declare module "src/other" {
     export {};
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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 {};
+}
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -198,7 +241,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -206,10 +249,16 @@ 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",
@@ -230,4 +279,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 cc8e0448932b6..b3c9812d6ef04 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
@@ -44,6 +44,7 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -67,10 +68,50 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -104,8 +145,19 @@ define("src/other", ["require", "exports"], function (require, exports) {
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 926
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -136,7 +188,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -144,6 +196,14 @@ 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
+
 
 
 
@@ -170,7 +230,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -183,11 +243,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -221,8 +294,19 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 918
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -253,7 +337,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -261,6 +345,14 @@ 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
+
 
 
 
@@ -287,4 +379,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
index dc91b889ee4cd..209dd57083743 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
@@ -43,6 +43,7 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -66,6 +67,40 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -87,7 +122,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -95,9 +130,16 @@ 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",
@@ -117,7 +159,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: Fix error
 
@@ -130,9 +172,16 @@ 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",
@@ -152,7 +201,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -160,9 +209,16 @@ 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",
@@ -182,4 +238,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 b585d4ab191bf..f496da224fcfe 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
@@ -38,9 +38,17 @@ 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.
 
-Found 1 error in file1.ts:1
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  file1.ts:1
+     1  tsconfig.json:4
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
@@ -134,9 +142,17 @@ 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]
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 b8d45e0d8b07c..d8fd2a45210d1 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
@@ -49,9 +49,17 @@ 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.
 
-Found 1 error in src/main.ts:2
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:2
+     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -154,9 +162,17 @@ 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
 
 
 
@@ -196,10 +212,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -234,10 +264,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 935
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 895
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -267,6 +309,38 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -296,7 +370,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -304,6 +378,14 @@ 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 +413,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 821f2071596ca..2ef8f159dc6d6 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
@@ -48,9 +48,17 @@ 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.
 
-Found 1 error in src/main.ts:2
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:2
+     1  tsconfig.json:4
 
 
 
@@ -86,9 +94,17 @@ 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
 
 
 
@@ -123,6 +139,7 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -152,6 +169,46 @@ declare module "src/main" { }
 declare module "src/other" {
     export {};
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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 {};
+}
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -174,7 +231,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -182,10 +239,16 @@ 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 +269,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 e0ac90762639d..cdde2e28ac3dd 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
@@ -48,9 +48,17 @@ 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.
 
-Found 1 error in src/main.ts:2
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:2
+     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -151,9 +159,17 @@ 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
 
 
 
@@ -192,10 +208,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -229,10 +259,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 910
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -250,6 +292,26 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -278,7 +340,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -286,6 +348,14 @@ 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
+
 
 
 
@@ -312,4 +382,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
index 7c687acb555ab..07a20ada288d3 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
@@ -47,9 +47,17 @@ 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.
 
-Found 1 error in src/main.ts:2
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:2
+     1  tsconfig.json:4
 
 
 
@@ -84,9 +92,17 @@ 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
 
 
 
@@ -120,6 +136,7 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -137,6 +154,34 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -158,7 +203,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -166,9 +211,16 @@ 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",
@@ -188,4 +240,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 79583845b0314..c37c05e33f5df 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
@@ -52,9 +52,17 @@ 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.
 
-Found 1 error in src/main.ts:4
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:4
+     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -144,9 +152,17 @@ 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
 
 
 
@@ -188,10 +204,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -226,10 +256,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 944
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 904
+=======
+  "size": 938
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -261,6 +303,40 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -290,7 +366,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -298,6 +374,14 @@ 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
+
 
 
 
@@ -325,4 +409,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 41b508feea352..2528750c24d58 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
@@ -51,9 +51,17 @@ 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.
 
-Found 1 error in src/main.ts:4
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:4
+     1  tsconfig.json:4
 
 
 
@@ -89,9 +97,17 @@ 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
 
 
 
@@ -128,6 +144,7 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -159,6 +176,48 @@ declare module "src/main" { }
 declare module "src/other" {
     export {};
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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 {};
+}
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -181,7 +240,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -189,10 +248,16 @@ 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",
@@ -213,4 +278,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 053b9a965b3ea..80c277ef96494 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
@@ -51,9 +51,17 @@ 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.
 
-Found 1 error in src/main.ts:4
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:4
+     1  tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
@@ -141,9 +149,17 @@ 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
 
 
 
@@ -184,10 +200,24 @@ 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]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -221,10 +251,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 925
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 885
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -244,6 +286,28 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
@@ -272,7 +336,7 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -280,6 +344,14 @@ 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
+
 
 
 
@@ -306,4 +378,4 @@ Semantic diagnostics in builder refreshed for::
 
 No shapes updated in the builder::
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
index 440c691c10aca..a204704629398 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
@@ -50,9 +50,17 @@ 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.
 
-Found 1 error in src/main.ts:4
+4     "module": "amd",
+                ~~~~~
 
+
+Found 2 errors in 2 files.
+
+Errors  Files
+     1  src/main.ts:4
+     1  tsconfig.json:4
 
 
 
@@ -87,9 +95,17 @@ 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
 
 
 
@@ -125,6 +141,7 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -144,6 +161,36 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+tsconfig.json:4:15 - error TS5107: Option '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
+
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -165,7 +212,7 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: no-change-run
 
@@ -173,9 +220,16 @@ 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",
@@ -195,4 +249,4 @@ Program files::
 /user/username/projects/noEmitOnError/src/main.ts
 /user/username/projects/noEmitOnError/src/other.ts
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 5ed0067c2d1c7..a71fdd7375f49 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
@@ -34,6 +34,11 @@ 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     {
@@ -44,7 +49,7 @@ Output::
   ~~~~~
 
 
-Found 1 error in tsconfig.json:7
+Found 2 errors in the same file, starting at: tsconfig.json:3
 
 
 
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 6a83368ce1d0e..4eccb7f0aec2f 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
@@ -44,7 +44,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -147,13 +152,7 @@ Program files::
 /home/src/projects/a/b/globalFile3.ts
 /home/src/projects/a/b/moduleFile2.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -178,7 +177,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -255,13 +259,7 @@ Program files::
 /home/src/projects/a/b/globalFile3.ts
 /home/src/projects/a/b/moduleFile2.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 c5110153469e7..0cab82a10a54e 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
@@ -39,7 +39,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -93,10 +98,7 @@ Program files::
 /home/src/projects/a/rootFolder/project/Scripts/Javascript.js
 /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -124,7 +126,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -152,10 +159,7 @@ Program files::
 /home/src/projects/a/rootFolder/project/Scripts/Javascript.js
 /home/src/projects/a/rootFolder/project/Scripts/TypeScript.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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 d54fd5286e1ea..e81e659312e30 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
@@ -59,6 +59,11 @@ 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
@@ -68,7 +73,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. 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
@@ -164,11 +169,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -209,6 +210,11 @@ 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
@@ -218,7 +224,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -293,11 +299,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 1b276f695ef75..a211b781fa982 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
@@ -59,6 +59,11 @@ 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
@@ -68,7 +73,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. 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
@@ -164,11 +169,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -209,6 +210,11 @@ 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
@@ -218,7 +224,7 @@ link/a.ts
   Imported via "./link/a" from file 'b.ts'
 b.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -293,11 +299,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 20ae3863b6348..f6f8c41f7d902 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
@@ -59,13 +59,10 @@ 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
-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 '**/*'
+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.
 
-2 import { a } from "./xY/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -172,11 +169,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -217,13 +210,10 @@ 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"}
-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 '**/*'
+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.
 
-2 import { a } from "./xY/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -309,11 +299,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 732425dc17d17..8d867cfd00df5 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
@@ -59,13 +59,10 @@ 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
-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 '**/*'
+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.
 
-2 import { a } from "./Xy/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -172,11 +169,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -217,13 +210,10 @@ 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"}
-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 '**/*'
+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.
 
-2 import { a } from "./Xy/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -309,11 +299,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 320a4e1285a88..4783f93aa5a29 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
@@ -59,13 +59,10 @@ 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
-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 '**/*'
+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.
 
-2 import { a } from "./Xy/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -172,11 +169,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -217,13 +210,10 @@ 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"}
-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 '**/*'
+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.
 
-2 import { a } from "./Xy/a";
-                    ~~~~~~~~
+5     "module": "system"
+                ~~~~~~~~
 
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
@@ -309,11 +299,7 @@ Program files::
 /user/username/projects/myproject/link/a.ts
 /user/username/projects/myproject/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
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 4fb9d2b500ee7..3e4bf6d592eef 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,7 +10,8 @@ export const y: string = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd"
+    "module": "amd",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -128,6 +129,7 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
+  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
@@ -247,6 +249,7 @@ 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 d8b8044cad7d0..ab2af545581f0 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,7 +10,8 @@ export const y: string = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd"
+    "module": "amd",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -150,6 +151,7 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
+  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
@@ -312,6 +314,7 @@ 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 ba1e3bb03c1f2..011f1c16cb756 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,7 +10,8 @@ export const y = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd"
+    "module": "amd",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -106,6 +107,7 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
+  "ignoreDeprecations": "6.0",
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
 Program structureReused: Not
@@ -203,6 +205,7 @@ 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 dd36f9ee83a93..f73be2bad4aa7 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,7 +10,8 @@ export const y = 20;
 {
   "compilerOptions": {
     "incremental": true,
-    "module": "amd"
+    "module": "amd",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -131,6 +132,7 @@ Program root files: [
 Program options: {
   "incremental": true,
   "module": 2,
+  "ignoreDeprecations": "6.0",
   "watch": true,
   "configFilePath": "/users/username/projects/project/tsconfig.json"
 }
@@ -274,6 +276,7 @@ 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 1e31c4a8f488d..3e96e29d6291a 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,7 +11,8 @@ export const y = 20;
   "compilerOptions": {
     "incremental": true,
     "module": "amd",
-    "outFile": "out.js"
+    "outFile": "out.js",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -92,6 +93,7 @@ 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 9534876aa218c..dafcc2d1c131d 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,7 +11,8 @@ export const y = 20;
   "compilerOptions": {
     "incremental": true,
     "module": "amd",
-    "outFile": "out.js"
+    "outFile": "out.js",
+    "ignoreDeprecations": "6.0"
   }
 }
 
@@ -117,6 +118,7 @@ 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/noEmit/outFile/dts-errors-with-incremental-as-modules.js b/tests/baselines/reference/tscWatch/noEmit/outFile/dts-errors-with-incremental-as-modules.js
index b16c51a8d2fbc..d98b14db30654 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
@@ -38,22 +38,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    1 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -82,35 +83,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 716
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -153,10 +138,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -181,12 +163,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -215,12 +208,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 734
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 694
+=======
+  "size": 701
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -244,10 +244,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -279,12 +276,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -313,8 +321,28 @@ 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",
+<<<<<<< HEAD
   "size": 717
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 677
+=======
+  "size": 714
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -361,7 +389,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -394,7 +422,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -419,7 +452,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -444,22 +477,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -488,35 +522,17 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "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
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1055
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1015
+=======
+  "size": 712
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -540,10 +556,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -585,12 +598,23 @@ Output::
                    ~
     Add a type annotation to the variable a.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -619,6 +643,20 @@ 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",
@@ -643,7 +681,13 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1038
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 998
+=======
+  "size": 1035
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -686,7 +730,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -719,15 +763,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:14 - error TS4094: Property 'p' of exported anonymous class type may not be private or protected.
+tsconfig.json:4:15 - 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 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.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -754,7 +793,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 64dea53457c91..96c3373ec55d1 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
@@ -37,12 +37,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -70,12 +81,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 733
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 693
+=======
+  "size": 697
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -117,10 +135,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -145,12 +160,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -178,12 +204,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -206,10 +239,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -240,12 +270,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -273,8 +314,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -311,7 +372,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -343,7 +404,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -367,7 +433,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -392,12 +458,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -425,9 +502,8 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
   "size": 733
@@ -453,10 +529,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -487,12 +560,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -520,8 +604,28 @@ 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",
+<<<<<<< HEAD
   "size": 713
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 673
+=======
+  "size": 710
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -563,7 +667,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -595,7 +699,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -619,7 +728,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 78539cfc6deaa..8f85fd9874d32 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
@@ -37,17 +37,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -75,26 +81,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 689
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -136,10 +135,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -164,12 +160,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -197,12 +204,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -225,10 +239,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -259,12 +270,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,8 +314,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -330,7 +372,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -362,7 +404,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -386,7 +433,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -411,17 +458,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -449,26 +502,17 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "semanticDiagnosticsPerFile": [
-    [
-      "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
-    ]
-  ],
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 877
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 837
+=======
+  "size": 685
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -491,10 +535,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -525,17 +566,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -564,21 +611,27 @@ Output::
     "outFile": "./outFile.js"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "./project/a.ts",
-      [
-        {
-          "start": 13,
-          "length": 1,
-          "code": 2322,
-          "category": 1,
-          "messageText": "Type 'string' is not assignable to type 'number'."
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./project/b.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 857
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 817
+=======
+  "size": 702
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
@@ -601,7 +654,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -633,10 +686,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-a.ts:1:14 - error TS2322: Type 'string' is not assignable to type 'number'.
+tsconfig.json:4:15 - 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 export const a: number = "hello"
-               ~
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -662,7 +715,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 1fb25301fc163..c8c84fe12d168 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
@@ -148,12 +148,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -181,12 +192,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js",
-    false
+  "changeFileSet": [
+    "./project/a.ts",
+    "./project/b.ts",
+    "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 718
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 678
+=======
+  "size": 682
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -209,10 +227,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -243,12 +258,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -276,8 +302,28 @@ 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",
+<<<<<<< HEAD
   "size": 698
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 658
+=======
+  "size": 695
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/home/src/projects/outFile.js]
@@ -314,7 +360,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -346,7 +392,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -370,7 +421,7 @@ Program files::
 /home/src/projects/project/a.ts
 /home/src/projects/project/b.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 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 fba8d09557102..cc6984043e910 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
@@ -55,7 +55,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -197,12 +202,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -237,10 +253,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 944
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 904
+=======
+  "size": 938
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -272,6 +300,40 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -347,7 +409,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -479,12 +546,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -519,10 +597,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 935
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 895
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -541,6 +631,27 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/dev-build.d.ts] file written with same contents
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -612,22 +723,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -662,35 +774,19 @@ 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 | DtsEmit",
-    17
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 1274
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1234
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -764,12 +860,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -804,10 +911,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js | Dts",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 943
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
+=======
+  "size": 937
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -849,6 +968,50 @@ declare module "src/other" {
 }
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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 {};
+}
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 7e3e9f7ab7781..8b0b6133752ef 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -54,7 +54,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -150,8 +155,14 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -183,6 +194,40 @@ declare module "src/main" { }
 declare module "src/other" {
     export {};
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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 {};
+}
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -259,7 +304,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -332,10 +382,16 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -354,6 +410,27 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/dev-build.d.ts] file written with same contents
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -424,15 +501,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-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; };
-               ~
+tsconfig.json:4:15 - 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
-    2 export const a = class { private p = 10; };
-                   ~
-    Add a type annotation to the variable a.
+4     "module": "amd",
+                ~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -508,8 +580,14 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -551,6 +629,50 @@ declare module "src/main" {
 declare module "src/other" {
     export {};
 }
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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 {};
+}
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 3f9d6ec740bba..e8075a6242cfd 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -54,7 +54,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -194,12 +199,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -233,10 +249,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 925
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 885
+=======
+  "size": 919
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -256,6 +284,28 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -330,7 +380,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -460,12 +515,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -499,10 +565,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 910
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -520,6 +598,26 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -590,12 +688,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -629,10 +738,22 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 926
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
+<<<<<<< HEAD
 //// [/user/username/projects/dev-build.js]
 define("shared/types/db", ["require", "exports"], function (require, exports) {
     "use strict";
@@ -656,6 +777,32 @@ define("src/other", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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");
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -726,12 +873,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -765,11 +923,21 @@ Output::
     "noEmitOnError": true,
     "outFile": "./dev-build.js"
   },
+  "pendingEmit": [
+    "Js",
+    false
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 924
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 884
+=======
+  "size": 918
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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 666e83b00c218..3a3bf4ada28db 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -53,7 +53,12 @@ Output::
 4 ;
   ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -148,8 +153,14 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -169,6 +180,28 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -244,7 +277,12 @@ Output::
 2 const a: string = 10;
         ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
@@ -316,8 +354,14 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -335,6 +379,26 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -406,8 +470,14 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
+
+<<<<<<< HEAD
 
 
 //// [/user/username/projects/dev-build.js]
@@ -431,6 +501,32 @@ define("src/other", ["require", "exports"], function (require, exports) {
     Object.defineProperty(exports, "__esModule", { value: true });
     console.log("hi");
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+
+
+//// [/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");
+});
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -502,11 +598,15 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:4:15 - error TS5107: Option '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.
 
 
 
-//// [/user/username/projects/dev-build.js] file written with same contents
 
 
 Program root files: [
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 43e27f1cb1b5e..d64b042665e3d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -105,10 +105,10 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
+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.
 
-1 export {}
-  ~~~~~~~~~
+3     "module": "none"
+                ~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -130,9 +130,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/workspace/solution/projects/project/f1.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/workspace/solution/projects/project/f1.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
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 9b9b10539d671..4a7986defb8fe 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
@@ -36,7 +36,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -107,10 +112,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -147,7 +149,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -210,8 +217,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 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 3c553efc446f3..2e6f14d8709a9 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
@@ -37,7 +37,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -109,10 +114,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -149,7 +151,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -213,8 +220,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 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 0acd653a85604..18c1fe5493959 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
@@ -35,7 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -97,10 +102,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -137,7 +139,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -195,8 +202,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 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 4fc2d4e397888..68c0a1087678a 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
@@ -35,7 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -94,10 +99,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -131,7 +133,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -201,11 +208,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 9c9783b05e2fa..437cc1e8f9587 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
@@ -35,7 +35,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -105,10 +110,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -145,7 +147,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -207,8 +214,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 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 e97cfe80fbf06..ea7d3b0e867fe 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
@@ -34,7 +34,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -95,10 +100,7 @@ Program files::
 /user/username/projects/myproject/file1.ts
 /user/username/projects/myproject/src/file2.ts
 
-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 cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -135,7 +137,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -192,8 +199,7 @@ Program files::
 /user/username/projects/myproject/src/file2.ts
 /user/username/projects/myproject/src/file3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/src/file3.ts
+No cached semantic diagnostics in the builder::
 
 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 1e540706c2c93..1b7ffed1f9b1c 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,7 +135,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -204,10 +209,7 @@ Program files::
 /user/username/workspace/solution/projects/module1.ts
 /user/username/workspace/solution/projects/project/file1.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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 e33603f0eca20..9a79c32c8c283 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
@@ -36,12 +36,17 @@ 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 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -93,10 +98,7 @@ Program files::
 /user/username/workspace/solution/projects/project/commonFile1.ts
 /user/username/workspace/solution/projects/project/commonFile2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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 a7621de844b30..053d4adeb789b 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
@@ -72,7 +72,12 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 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
@@ -92,7 +97,13 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -141,9 +152,29 @@ 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",
+<<<<<<< HEAD
   "size": 912
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 872
+=======
+  "size": 909
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -192,10 +223,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -248,10 +276,16 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
+<<<<<<< HEAD
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
@@ -308,6 +342,65 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   "size": 926
 }
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+}
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -357,7 +450,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -429,13 +522,24 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -494,9 +598,33 @@ 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",
+<<<<<<< HEAD
   "size": 1014
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 974
+=======
+  "size": 1013
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -549,11 +677,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
@@ -626,13 +750,24 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -682,6 +817,10 @@ 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"
@@ -693,7 +832,13 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 947
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 907
+=======
+  "size": 909
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -749,9 +894,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/projects/project1/class1.d.ts
-/user/username/projects/myproject/projects/project2/class2.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class1.d.ts (used version)
@@ -825,13 +968,24 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -890,9 +1044,33 @@ 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",
+<<<<<<< HEAD
   "size": 1014
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 974
+=======
+  "size": 1013
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -945,11 +1123,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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/when-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
index 0e8c67913edb4..77a37b62095cb 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
@@ -150,7 +150,13 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -201,9 +207,29 @@ 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",
+<<<<<<< HEAD
   "size": 917
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 877
+=======
+  "size": 914
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/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 804ec986c20ef..ec6a7df32fd82 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -27,17 +27,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not 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.
 
-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.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -83,10 +75,7 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -115,22 +104,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
-
-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()
-  ~~~
+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 3 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -156,8 +132,7 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-Semantic diagnostics in builder refreshed for::
-/users/username/projects/project/d/f0.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/d/f0.ts (computed .d.ts)
@@ -183,10 +158,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-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"
-                  ~~~~
+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.
 
@@ -240,8 +212,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/d/f0.ts
 
-Semantic diagnostics in builder refreshed for::
-/users/username/projects/project/d/f0.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/d/f0.ts (computed .d.ts)
@@ -267,17 +238,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-d/f0.ts:1:17 - error TS2306: File '/users/username/projects/project/f1.ts' is not a module.
-
-1 import {x} from "f1"
-                  ~~~~
-
-f1.ts:1:1 - error TS2304: Cannot find name 'foo'.
+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 foo()
-  ~~~
-
-[HH:MM:SS AM] Found 2 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -327,10 +290,7 @@ Program files::
 /users/username/projects/project/f1.ts
 /users/username/projects/project/d/f0.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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 683c66a3e0848..18e281283078a 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
@@ -24,10 +24,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-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"
-                  ~~~~~
+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.
 
@@ -72,9 +69,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/foo.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/users/username/projects/project/foo.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -105,7 +100,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -153,9 +150,7 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-Semantic diagnostics in builder refreshed for::
-/users/username/projects/project/bar.d.ts
-/users/username/projects/project/foo.ts
+No cached semantic diagnostics in the builder::
 
 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 221b8f3e76bef..f1cfe69ceb4eb 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
@@ -27,7 +27,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -67,10 +69,7 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -98,10 +97,7 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-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"
-                  ~~~~~
+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.
 
@@ -148,8 +144,7 @@ Program files::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /users/username/projects/project/foo.ts
 
-Semantic diagnostics in builder refreshed for::
-/users/username/projects/project/foo.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /users/username/projects/project/foo.ts (computed .d.ts)
@@ -184,7 +179,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -229,9 +226,7 @@ Program files::
 /users/username/projects/project/bar.d.ts
 /users/username/projects/project/foo.ts
 
-Semantic diagnostics in builder refreshed for::
-/users/username/projects/project/bar.d.ts
-/users/username/projects/project/foo.ts
+No cached semantic diagnostics in the builder::
 
 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 05970d417fd76..363efc4fec17c 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
@@ -43,7 +43,12 @@ Output::
             ~~~~~~~~~~~~~~~~~
     File is entry point of type library specified here.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -160,7 +165,12 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -208,10 +218,7 @@ Program files::
 /user/username/projects/myproject/lib/app.ts
 /user/username/projects/myproject/node_modules/@myapp/ts-types/types/somefile.define.d.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js b/tests/baselines/reference/tscWatch/watchApi/multiFile/when-emitting-with-emitOnlyDtsFiles.js
index 10933d2b1cdb9..f62ea01fa6ca0 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
@@ -57,7 +57,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
 1 export const y: 10 = 20;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
@@ -214,7 +219,13 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -234,12 +245,8 @@ 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": "-6821242887-export declare const x = 10;\n"
+      "signature": "-10726455937-export const x = 10;"
     },
     "./b.ts": {
       "original": {
@@ -267,33 +274,29 @@ CreatingProgramWith::
   },
   "affectedFilesPendingEmit": [
     [
-      [
-        "./a.ts",
-        1
-      ],
-      "Js"
+      "./a.ts",
+      "Js | Dts"
     ],
     [
-      [
-        "./b.ts",
-        1
-      ],
-      "Js"
+      "./b.ts",
+      "Js | Dts"
     ]
   ],
-  "latestChangedDtsFile": "./b.d.ts",
+  "emitSignatures": [
+    "./a.ts",
+    "./b.ts"
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 957
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 917
+=======
+  "size": 843
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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: [
@@ -335,6 +338,7 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
+<<<<<<< HEAD
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
@@ -410,6 +414,84 @@ define(["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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;
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 fad9acdac1a89..62090bf4bdcae 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
@@ -36,12 +36,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -70,12 +81,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./myproject/main.ts",
+    "./myproject/other.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 751
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 711
+=======
+  "size": 718
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -116,10 +134,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -130,12 +145,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -164,10 +190,30 @@ 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",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 913
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -251,7 +297,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -290,12 +336,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -324,14 +381,19 @@ 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",
+<<<<<<< HEAD
   "size": 949
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 909
+=======
+  "size": 912
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -372,10 +434,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -386,12 +445,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -420,10 +490,30 @@ 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",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -499,7 +589,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -539,12 +629,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -573,10 +674,30 @@ 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",
+<<<<<<< HEAD
   "size": 948
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 908
+=======
+  "size": 945
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -633,10 +754,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 493e70f1b107a..1c16d89b7f784 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
@@ -36,12 +36,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -70,12 +81,19 @@ Output::
     "module": 2,
     "outFile": "./outFile.js"
   },
-  "pendingEmit": [
-    "Js | DtsEmit",
-    17
+  "changeFileSet": [
+    "../../../home/src/tslibs/ts/lib/lib.d.ts",
+    "./myproject/main.ts",
+    "./myproject/other.ts"
   ],
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 751
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 711
+=======
+  "size": 718
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -116,10 +134,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -137,12 +152,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -171,10 +197,30 @@ 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",
+<<<<<<< HEAD
   "size": 916
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 876
+=======
+  "size": 913
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -258,7 +304,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -304,12 +350,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -338,14 +395,19 @@ 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",
+<<<<<<< HEAD
   "size": 949
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 909
+=======
+  "size": 912
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -386,10 +448,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -407,12 +466,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -441,10 +511,30 @@ 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",
+<<<<<<< HEAD
   "size": 932
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 892
+=======
+  "size": 929
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -520,7 +610,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -567,12 +657,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -601,10 +702,19 @@ 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",
+<<<<<<< HEAD
   "size": 948
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 908
+=======
+  "size": 928
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/outFile.js]
@@ -661,10 +771,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 6aaea40346481..3c940677831f8 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
@@ -42,7 +42,12 @@ Output::
 1 export const x: string = 10;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -184,7 +189,12 @@ Output::
 1 export const x: string = 10;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -320,12 +330,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -355,36 +376,21 @@ 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
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 937
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 897
+=======
+  "size": 749
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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 f83eb68cdc2eb..bfdf083c978c6 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
@@ -42,7 +42,12 @@ Output::
 1 export const x: string = 10;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -191,7 +196,12 @@ Output::
 1 export const x: string = 10;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -334,12 +344,23 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -369,36 +390,21 @@ 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
+  ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 937
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 897
+=======
+  "size": 749
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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 1508f7e821e97..cb16c8a63382b 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
@@ -42,7 +42,12 @@ Output::
 1 export const x: string = 10;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
@@ -182,7 +187,13 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -212,25 +223,21 @@ 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",
-    1
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 953
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 913
+=======
+  "size": 749
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/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 0b4534b6ce2b7..f9cbd34b309ba 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
@@ -30,7 +30,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -71,10 +73,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -100,7 +99,9 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
@@ -122,10 +123,7 @@ Program files::
 /user/username/projects/myproject/main.ts
 /user/username/projects/myproject/other.ts
 
-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 cached semantic diagnostics in the builder::
 
 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 5394aa6001348..31e234bcd79e3 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
@@ -58,7 +58,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node
 1 export const y: 10 = 20;
                ~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:5:15 - 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.
 
 
 
@@ -190,7 +195,13 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -220,25 +231,21 @@ 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",
-    1
+    "Js | Dts",
+    false
   ],
+  "errors": true,
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 923
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 883
+=======
+  "size": 725
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
-//// [/user/username/projects/myproject/outFile.d.ts]
-declare module "a" {
-    export const x = 10;
-}
-declare module "b" {
-    export const y = 10;
-}
-
-
 
 
 Program root files: [
@@ -282,6 +289,7 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
+<<<<<<< HEAD
 //// [/user/username/projects/myproject/outFile.tsbuildinfo]
 {"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
@@ -334,6 +342,61 @@ define("b", ["require", "exports"], function (require, exports) {
 });
 
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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;
+});
+
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 9bafe269a3e9a..1f4770f59c003 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
@@ -72,7 +72,12 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 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
@@ -92,7 +97,13 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -141,9 +152,29 @@ 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",
+<<<<<<< HEAD
   "size": 912
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 872
+=======
+  "size": 909
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -190,10 +221,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -246,10 +274,16 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
+<<<<<<< HEAD
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
@@ -306,6 +340,65 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   "size": 926
 }
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//// [/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
+}
+
+=======
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -353,7 +446,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
@@ -425,13 +518,24 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -490,9 +594,33 @@ 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",
+<<<<<<< HEAD
   "size": 1014
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 974
+=======
+  "size": 1013
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -543,11 +671,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class3.d.ts (used version)
@@ -620,13 +744,24 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
       ~~~~~
     File is output from referenced project specified here.
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -676,6 +811,10 @@ 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"
@@ -687,7 +826,13 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
+<<<<<<< HEAD
   "size": 947
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 907
+=======
+  "size": 909
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -741,9 +886,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/projects/project1/class1.d.ts
-/user/username/projects/myproject/projects/project2/class2.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/projects/project1/class1.d.ts (used version)
@@ -817,13 +960,24 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -882,9 +1036,33 @@ 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",
+<<<<<<< HEAD
   "size": 1014
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 974
+=======
+  "size": 1013
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -935,11 +1113,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.d.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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 55a841befebd0..72d3ac1fab690 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
@@ -72,7 +72,12 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 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
@@ -92,7 +97,13 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -141,9 +152,29 @@ 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",
+<<<<<<< HEAD
   "size": 900
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 860
+=======
+  "size": 897
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -190,10 +221,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class1.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -233,13 +261,24 @@ 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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+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.
 
 
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","../project1/class3.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -300,9 +339,33 @@ 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",
+<<<<<<< HEAD
   "size": 1098
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1058
+=======
+  "size": 1097
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -353,11 +416,7 @@ Program files::
 /user/username/projects/myproject/projects/project1/class3.ts
 /user/username/projects/myproject/projects/project2/class2.ts
 
-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
+No cached semantic diagnostics in the builder::
 
 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
new file mode 100644
index 0000000000000..5b331ebadd7a2
--- /dev/null
+++ b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.errors.txt
@@ -0,0 +1,21 @@
+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/tsserver/compileOnSave/configProjects-outFile.js b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
index 2370ca81e625a..3ab89481416ee 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/configProjects-outFile.js
@@ -156,7 +156,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 ef7d3f0f88584..6ea2b42988fd8 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
@@ -167,7 +167,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/file1.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 1a6293107df3e..cfcc6add058b3 100644
--- a/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
+++ b/tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
@@ -167,7 +167,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/file1.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 26f3fb216c4c8..78eeef62ec508 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
@@ -153,7 +153,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 f79ec25ad8e70..df25e66bbfd7c 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
@@ -532,7 +532,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 e71bf07df3465..aa4f6ffff174d 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
@@ -142,7 +142,22 @@ Info seq  [hh:mm:ss:mss] event:
       "event": "CustomHandler::configFileDiag",
       "body": {
         "configFileName": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": [],
+        "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"
+          }
+        ],
         "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 891d9c6788a33..c1cc6c26b0ce4 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
@@ -146,7 +146,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 a41c43fa4e65e..a71774e4b2b40 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
@@ -146,7 +146,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/project/file1Consumer1.ts",
         "configFile": "/users/username/projects/project/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 63764edbb293d..65cc8a25b9a33 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 91ecedc1222e5..1ac58f7770722 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 948337ee368c5..918b06b5296e2 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 97c23a7cfa406..3f80065de31bc 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 a43a05d918f03..744f81cf1a107 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 d1e0bd064cc31..9fd9c95956d96 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 ab3a5a7c85765..64c32b68d30f6 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 5857aa29f4d2d..15b71b65077be 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 f31039635bb30..969c90978f25d 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 47193ffc4ca51..e14c39511e189 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 74f2addb59635..2078eb388049f 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 4dbc89378fe13..58c3154e6dcdf 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 fcea43f42343a..750dedbe3c99f 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 f86ae767a9ee0..093e4c14c48d4 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 34519038cba1a..fb272e73c6c6d 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 5244a4d804bdf..3cbe1079bbdac 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 5d674cd2417f9..cb76a000a922f 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 edbe677956ad3..09d2130c9ef90 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 a4d5bde836f93..c6b52acab506d 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 f242146796937..b34b9f3eceefb 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
@@ -168,7 +168,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/b.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 83a2b12427af0..2496829f1586a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
@@ -527,8 +527,10 @@ 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] 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] 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: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -543,7 +545,7 @@ Info seq  [hh:mm:ss:mss] response:
         "updateGraphDurationMs": *
       },
       "body": {
-        "flags": 1,
+        "flags": 9,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -955,12 +957,19 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "class",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/common-dependency/index",
+            "source": "common-dependency",
             "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
             }
@@ -970,12 +979,19 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "class",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/package-dependency/index",
+            "source": "package-dependency",
             "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
             }
@@ -989,6 +1005,60 @@ 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 97bfe18310faf..31b2cc3971cab 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
@@ -3598,10 +3598,22 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "completionInfo"
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
+<<<<<<< HEAD
 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/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
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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] 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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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)
@@ -4239,12 +4251,6 @@ 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:
   {}
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
index db8675136f3a7..1511587f53316 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_exportUndefined.js
@@ -410,8 +410,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 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: 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: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -423,7 +423,7 @@ Info seq  [hh:mm:ss:mss] response:
       "request_seq": 3,
       "success": true,
       "body": {
-        "flags": 1,
+        "flags": 9,
         "isGlobalCompletion": true,
         "isMemberCompletion": false,
         "isNewIdentifierLocation": false,
@@ -1075,11 +1075,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "const",
             "kindModifiers": "",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/undefinedAlias",
+            "source": "./undefinedAlias",
             "hasAction": true,
+            "sourceDisplay": [
+              {
+                "text": "./undefinedAlias",
+                "kind": "text"
+              }
+            ],
             "data": {
               "exportName": "export=",
               "exportMapKey": "1 * x ",
+              "moduleSpecifier": "./undefinedAlias",
               "fileName": "/home/src/workspaces/project/undefinedAlias.ts"
             }
           },
@@ -1149,7 +1156,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 incomplete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1813,11 +1820,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "const",
             "kindModifiers": "",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/undefinedAlias",
+            "source": "./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 bcf73eac1345e..b6b65003eb331 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_moduleAugmentation.js
@@ -457,7 +457,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 incomplete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1131,11 +1131,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -1144,11 +1151,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -1219,7 +1233,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 incomplete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -1893,11 +1907,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -1906,11 +1927,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -4444,7 +4472,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 incomplete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -5121,11 +5149,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -5134,11 +5169,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -5210,7 +5252,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 incomplete
+Info seq  [hh:mm:ss:mss] collectAutoImports: response is complete
 Info seq  [hh:mm:ss:mss] collectAutoImports: *
 Info seq  [hh:mm:ss:mss] getCompletionData: Semantic work: *
 Info seq  [hh:mm:ss:mss] getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
@@ -5884,11 +5926,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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"
             }
           },
@@ -5897,11 +5946,18 @@ Info seq  [hh:mm:ss:mss] response:
             "kind": "function",
             "kindModifiers": "export,declare",
             "sortText": "16",
-            "source": "/home/src/workspaces/project/node_modules/@types/react/index",
+            "source": "react",
             "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 fe3d5f2a16705..286faeb95a11d 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/isDefinitionAcrossGlobalProjects.js
@@ -235,7 +235,13 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/project/a/tsconfig.json ProjectRootPath: undefined:: Result: /home/src/workspaces/project/tsconfig.json
@@ -618,7 +624,13 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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
@@ -684,7 +696,13 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 83e0f3eebd0d3..37a64c9844911 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
@@ -1109,7 +1109,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/project/tsconfig.json",
         "configFile": "/home/src/projects/project/tsconfig.json",
-        "diagnostics": []
+        "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"
+          }
+        ]
       }
     }
 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 b30da8a4b2756..0c2d2ea4298a5 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
@@ -154,6 +154,20 @@ 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 91e9012252237..394b9fff07413 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
@@ -90,7 +90,13 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -113,10 +119,26 @@ 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",
+<<<<<<< HEAD
   "size": 918
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 878
+=======
+  "size": 913
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 //// [/user/username/projects/myproject/SiblingClass/Source.js]
@@ -139,7 +161,13 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo]
+<<<<<<< HEAD
 {"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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"}
+=======
+{"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"}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -164,10 +192,30 @@ 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",
+<<<<<<< HEAD
   "size": 1049
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1009
+=======
+  "size": 1046
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 }
 
 
@@ -310,7 +358,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 416cab1312765..760b8c898a98f 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
@@ -202,7 +202,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 9a26f7be98059..351bf2e82c317 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
@@ -452,7 +452,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 3038e196e4008..01de794304b00 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
@@ -196,7 +196,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -330,6 +345,20 @@ 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"
           }
         ]
       }
@@ -486,7 +515,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -678,6 +722,20 @@ 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"
           }
         ]
       }
@@ -795,7 +853,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 aa5b818754363..776473235497e 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
@@ -193,7 +193,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 fd27446a15b45..c49c638c51d49 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
@@ -196,7 +196,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -372,7 +387,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project1/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -532,6 +562,20 @@ 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"
           }
         ]
       }
@@ -759,7 +803,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -992,6 +1051,20 @@ 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"
           }
         ]
       }
@@ -1137,7 +1210,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 f898c33029e0e..63d1fb5608776 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
@@ -193,7 +193,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/projects/project2/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -370,7 +385,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 20a1e693c740b..e64b08d660c9e 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
@@ -205,7 +205,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 148a97fcaf36b..c8f098e474e4c 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
@@ -210,7 +210,71 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
+<<<<<<< HEAD
         "diagnostics": []
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        "diagnostics": [
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/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,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
+          }
+        ]
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
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 9b02a29a4cc51..992bba9bf7d40 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,7 +222,71 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
+<<<<<<< HEAD
         "diagnostics": []
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+        "diagnostics": [
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/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,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
+          }
+        ]
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
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 5ace0a8a8d149..35dfa3b41d122 100644
--- a/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
+++ b/tests/baselines/reference/tsserver/typeReferenceDirectives/when-typeReferenceDirective-contains-UpperCasePackage.js
@@ -215,7 +215,22 @@ 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": []
+        "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"
+          }
+        ]
       }
     }
 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 df73024d3883b..5ac0f74a1eaf0 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
@@ -346,7 +346,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 3,
               "offset": 35
             },
-            "text": "Argument for '--moduleResolution' option must be: 'node10', 'classic', 'node16', 'nodenext', 'bundler'.",
+            "text": "Argument for '--moduleResolution' option must be: '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 f08cc54720a4f..b5111b9e7bec6 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -31,6 +31,7 @@ export class MyComponent {
 
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -47,3 +48,42 @@ define(["require", "exports"], function (require, exports) {
     // Should be ok
     <MyComponent data-bar='hello'/>;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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'/>;
+});
+=======
+"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'/>;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index ee5fe442ab264..4871daadd2d73 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -27,6 +27,7 @@ export class MyComponent {
 
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -39,3 +40,34 @@ define(["require", "exports"], function (require, exports) {
     <MyComponent foo="bar"/>; // ok  
     <MyComponent foo={0}/>; // should be an error
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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
+});
+=======
+"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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxElementResolution17.errors.txt b/tests/baselines/reference/tsxElementResolution17.errors.txt
new file mode 100644
index 0000000000000..a8d7b896a9ba4
--- /dev/null
+++ b/tests/baselines/reference/tsxElementResolution17.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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 438a1643921ab..a22df6da4fc09 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -20,6 +20,7 @@ import {MyClass} from './file1';
 
 
 //// [file1.js]
+<<<<<<< HEAD
 define(["require", "exports"], function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -28,9 +29,114 @@ define(["require", "exports"], function (require, exports) {
     }
     exports.MyClass = MyClass;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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;
+});
+=======
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MyClass = void 0;
+var MyClass = /** @class */ (function () {
+    function MyClass() {
+    }
+    return MyClass;
+}());
+exports.MyClass = MyClass;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [file2.js]
+<<<<<<< HEAD
+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);
+});
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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", "react", "./file1"], function (require, exports, React, file1_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
+    React = __importStar(React);
     React.createElement(file1_1.MyClass, null);
 });
+=======
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxPreserveEmit1.errors.txt b/tests/baselines/reference/tsxPreserveEmit1.errors.txt
new file mode 100644
index 0000000000000..cad606d8c3434
--- /dev/null
+++ b/tests/baselines/reference/tsxPreserveEmit1.errors.txt
@@ -0,0 +1,35 @@
+error TS5107: Option '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 3b1d03d9fb37e..ed5230cf866b3 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.types
+++ b/tests/baselines/reference/tsxPreserveEmit1.types
@@ -19,9 +19,12 @@ import Route = ReactRouter.Route;
 >      : ^^^
 
 var routes1 = <Route />;
->routes1 : error
-><Route /> : error
+>routes1 : any
+>        : ^^^
+><Route /> : any
+>          : ^^^
 >Route : any
+>      : ^^^
 
 module M {
 >M : typeof M
@@ -29,6 +32,7 @@ module M {
 
 	export var X: any;
 >X : any
+>  : ^^^
 }
 module M {
 >M : typeof M
@@ -36,10 +40,14 @@ module M {
 
 	// Should emit 'M.X' in both opening and closing tags
 	var y = <X></X>;
->y : error
-><X></X> : error
+>y : any
+>  : ^^^
+><X></X> : any
+>        : ^^^
 >X : any
+>  : ^^^
 >X : any
+>  : ^^^
 }
 
 === react.d.ts ===
@@ -49,6 +57,7 @@ declare module 'react' {
 
 	var x: any;
 >x : any
+>  : ^^^
 
 	export = x;
 >x : any
@@ -61,6 +70,7 @@ declare module ReactRouter {
 
 	var Route: any;
 >Route : any
+>      : ^^^
 
 	interface Thing { }
 }
diff --git a/tests/baselines/reference/tsxPreserveEmit2.errors.txt b/tests/baselines/reference/tsxPreserveEmit2.errors.txt
new file mode 100644
index 0000000000000..352e49180d059
--- /dev/null
+++ b/tests/baselines/reference/tsxPreserveEmit2.errors.txt
@@ -0,0 +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 '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 0a2187015afe1..7d04b8e11f400 100644
--- a/tests/baselines/reference/tsxPreserveEmit2.types
+++ b/tests/baselines/reference/tsxPreserveEmit2.types
@@ -3,9 +3,13 @@
 === test.tsx ===
 var Route: any;
 >Route : any
+>      : ^^^
 
 var routes1 = <Route />;
->routes1 : error
-><Route /> : error
+>routes1 : any
+>        : ^^^
+><Route /> : any
+>          : ^^^
 >Route : any
+>      : ^^^
 
diff --git a/tests/baselines/reference/tsxPreserveEmit3.errors.txt b/tests/baselines/reference/tsxPreserveEmit3.errors.txt
new file mode 100644
index 0000000000000..581d5de36c4de
--- /dev/null
+++ b/tests/baselines/reference/tsxPreserveEmit3.errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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 2419af27a3ec4..f708932c21602 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.types
+++ b/tests/baselines/reference/tsxPreserveEmit3.types
@@ -13,6 +13,7 @@ declare module 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
new file mode 100644
index 0000000000000..028a9f04c0c5a
--- /dev/null
+++ b/tests/baselines/reference/tsxSfcReturnNull.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 fcbf68830c8f3..d5019a32d4f2e 100644
--- a/tests/baselines/reference/tsxSfcReturnNull.types
+++ b/tests/baselines/reference/tsxSfcReturnNull.types
@@ -11,6 +11,7 @@ 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
new file mode 100644
index 0000000000000..028a9f04c0c5a
--- /dev/null
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.errors.txt
@@ -0,0 +1,15 @@
+error TS5107: Option '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 6321ff67a485f..810d031011a76 100644
--- a/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
+++ b/tests/baselines/reference/tsxSfcReturnNullStrictNullChecks.types
@@ -11,6 +11,7 @@ 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 e93d37d3d8ca1..04eeb0b11d5d3 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
@@ -13,6 +13,7 @@ const foo = <Foo />;
 const G = <Greet />;
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -24,3 +25,27 @@ define(["require", "exports", "react"], function (require, exports, React) {
     const foo = <Foo />;
     const G = <Greet />;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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 />;
+});
+=======
+"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 />;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 508f839052887..5d9568a1b87f0 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 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(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(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 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 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.
     }
     function TodoList({ todos }: TodoListProps) {
         return <div>
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
index 6bb7e55a30787..798bb8c18c256 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload1.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..5132e02d98719
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.errors.txt
@@ -0,0 +1,37 @@
+error TS5107: Option '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 f8022330bd223..479db6c2f8e64 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload2.types
@@ -76,6 +76,7 @@ let obj2 = {
 
 let defaultObj: any;
 >defaultObj : any
+>           : ^^^
 
 // OK
 const c1 = <OneThing />
@@ -166,6 +167,7 @@ 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
new file mode 100644
index 0000000000000..fe4eb1fcc947c
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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 2c18fe7f97bef..f2aa2b6594741 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload3.types
@@ -4,6 +4,7 @@
 interface Context {
     color: any;
 >color : any
+>      : ^^^
 }
 declare function ZeroThingOrTwoThing(): JSX.Element;
 >ZeroThingOrTwoThing : { (): JSX.Element; (l: { yy: number; yy1: string; }, context: Context): JSX.Element; }
@@ -27,6 +28,7 @@ declare function ZeroThingOrTwoThing(l: {yy: number, yy1: string}, context: Cont
 
 let obj2: any;
 >obj2 : any
+>     : ^^^
 
 // OK
 const two1 = <ZeroThingOrTwoThing />;
@@ -59,6 +61,7 @@ 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
@@ -72,6 +75,7 @@ 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
@@ -81,6 +85,7 @@ 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
@@ -118,6 +123,7 @@ declare function ThreeThing(l: {yy: number, yy1: string}, context: Context, upda
 >context : Context
 >        : ^^^^^^^
 >updater : any
+>        : ^^^
 >JSX : any
 >    : ^^^
 
@@ -154,6 +160,7 @@ 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 f6f9a0e6dae2f..4aceb0c98758a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
@@ -40,6 +40,7 @@ const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -66,3 +67,57 @@ define(["require", "exports", "react"], function (require, exports, React) {
     const e3 = <TestingOptional y1="hello" y2={1000} children="hi"/>;
     const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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>;
+});
+=======
+"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>;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
index 72ed49be53bfd..9d9efd2dbb8f4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
@@ -59,6 +59,7 @@ const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -80,7 +81,51 @@ define(["require", "exports", "react"], function (require, exports, React) {
             return this._buildMainLink(props);
         }
         return this._buildMainButton(props);
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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);
+=======
+"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);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
+<<<<<<< HEAD
     // Error
     const b0 = <MainButton to='/some/path' onClick={(e) => { }}>GO</MainButton>; // extra property;
     const b1 = <MainButton onClick={(e) => { }} {...obj0}>Hello world</MainButton>; // extra property;
@@ -92,3 +137,29 @@ define(["require", "exports", "react"], function (require, exports, React) {
     const b7 = <MainButton {...{ onClick(e) { } }} children="hello" className/>; // incorrect type for optional attribute
     const b8 = <MainButton data-format/>; // incorrect type for specified hyphanated name
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    // 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
+});
+=======
+    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
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
index ed8f69208c024..cff94191ed053 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
@@ -60,6 +60,7 @@ const b12 = <MainButton data-format="Hello world" />
 
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -78,7 +79,45 @@ define(["require", "exports", "react"], function (require, exports, React) {
             return this._buildMainLink(props);
         }
         return this._buildMainButton(props);
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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);
+=======
+"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);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
+<<<<<<< HEAD
     // OK
     const b0 = <MainButton to='/some/path'>GO</MainButton>;
     const b1 = <MainButton onClick={(e) => { }}>Hello world</MainButton>;
@@ -94,3 +133,37 @@ define(["require", "exports", "react"], function (require, exports, React) {
     const b11 = <MainButton onClick={(e) => { }} className="hello" data-format>Hello world</MainButton>;
     const b12 = <MainButton data-format="Hello world"/>;
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    // 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"/>;
+});
+=======
+    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"/>;
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
new file mode 100644
index 0000000000000..795f9da77205b
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter1.errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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 022a16b79ea53..ebc2736a796d4 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentWithDefaultTypeParameter2.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..38242626b59ab
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.errors.txt
@@ -0,0 +1,22 @@
+error TS5107: Option '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 8cf998091eec3..a3d87d3a03a0a 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponents3.types
+++ b/tests/baselines/reference/tsxStatelessFunctionComponents3.types
@@ -11,6 +11,7 @@ const Foo = (props: any) => <div/>;
 >(props: any) => <div/> : (props: any) => JSX.Element
 >                       : ^     ^^   ^^^^^^^^^^^^^^^^
 >props : any
+>      : ^^^
 ><div/> : JSX.Element
 >       : ^^^^^^^^^^^
 >div : any
@@ -61,6 +62,7 @@ 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
new file mode 100644
index 0000000000000..bbe13314ee5bd
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments1.errors.txt
@@ -0,0 +1,35 @@
+error TS5107: Option '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 e815607ea82a4..5d0e87b0a004c 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments2.errors.txt
@@ -1,3 +1,4 @@
+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.
@@ -11,6 +12,7 @@ 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
new file mode 100644
index 0000000000000..83d30a9ba4ae0
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments3.errors.txt
@@ -0,0 +1,28 @@
+error TS5107: Option '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 691ae584ee30e..056be9ca1b307 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
@@ -14,6 +14,7 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 }
 
 //// [file.jsx]
+<<<<<<< HEAD
 define(["require", "exports", "react"], function (require, exports, React) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -23,3 +24,23 @@ define(["require", "exports", "react"], function (require, exports, React) {
         let a2 = <OverloadComponent {...arg1} ignore-prop/>; // missing a
     }
 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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
+    }
+});
+=======
+"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
+}
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
new file mode 100644
index 0000000000000..85277801e12b1
--- /dev/null
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments5.errors.txt
@@ -0,0 +1,23 @@
+error TS5107: Option '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 5cdb7e0aa9378..8413241fabb1f 100644
--- a/tests/baselines/reference/typeAliasDeclarationEmit.js
+++ b/tests/baselines/reference/typeAliasDeclarationEmit.js
@@ -6,10 +6,8 @@ export type callback<T> = () => T;
 export type CallbackArray<T extends callback> = () => T;
 
 //// [typeAliasDeclarationEmit.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"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
new file mode 100644
index 0000000000000..f832ebfd15ebd
--- /dev/null
+++ b/tests/baselines/reference/typeAliasDeclarationEmit2.errors.txt
@@ -0,0 +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 '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/typeParameterCompatibilityAccrossDeclarations.errors.txt b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
new file mode 100644
index 0000000000000..4c18d0e2fe3a8
--- /dev/null
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.errors.txt
@@ -0,0 +1,27 @@
+error TS5107: Option '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 2b5e9bf0e62ad..5eb9001881bde 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
@@ -27,6 +27,7 @@ var a2 = {
 >function (y: any): any { return null; } : (y: any) => any
 >                                        : ^ ^^   ^^^^^   
 >y : any
+>  : ^^^
 }
 export interface I {
    x<T>(y: T): T;
@@ -40,6 +41,7 @@ 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
new file mode 100644
index 0000000000000..f6d8947e4958a
--- /dev/null
+++ b/tests/baselines/reference/typeResolution.errors.txt
@@ -0,0 +1,115 @@
+error TS5107: Option '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 fe3a18ca49aec..a70db36c17046 100644
--- a/tests/baselines/reference/typeResolution.types
+++ b/tests/baselines/reference/typeResolution.types
@@ -137,6 +137,7 @@ export module TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
+>                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -150,6 +151,7 @@ export module TopLevelModule1 {
 >SubSubModule1 : any
 >              : ^^^
 >d2.XisIn1_1_1() : any
+>                : ^^^
 >d2.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d2 : InterfaceX
@@ -300,6 +302,7 @@ export module TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
+>                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -313,6 +316,7 @@ export module TopLevelModule1 {
 >SubSubModule1 : any
 >              : ^^^
 >d2.XisIn1_1_1() : any
+>                : ^^^
 >d2.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d2 : InterfaceX
@@ -375,6 +379,7 @@ export module TopLevelModule1 {
 >d1 : InterfaceX
 >   : ^^^^^^^^^^
 >d1.XisIn1_1_1() : any
+>                : ^^^
 >d1.XisIn1_1_1 : () => any
 >              : ^^^^^^^^^
 >d1 : InterfaceX
@@ -467,6 +472,7 @@ export module 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 16eb9d51ca4b0..76f4d379dbc94 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 d7b083e1b6c96..4e69754c6ee4e 100644
--- a/tests/baselines/reference/typeUsedAsValueError2.js
+++ b/tests/baselines/reference/typeUsedAsValueError2.js
@@ -15,26 +15,20 @@ 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]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [helloNamespace.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //// [world.js]
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    HelloInterface.world;
-    HelloNamespace.world;
-});
+"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 d4f9237cfbec5..2675ab57abf64 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, 50))
+import HelloNamespace = require("./helloNamespace");
+>HelloNamespace : Symbol(HelloNamespace, Decl(world.ts, 0, 52))
 
 HelloInterface.world;
 HelloNamespace.world;
diff --git a/tests/baselines/reference/typeUsedAsValueError2.types b/tests/baselines/reference/typeUsedAsValueError2.types
index f0860e66efe17..5a20c8b8c3208 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
new file mode 100644
index 0000000000000..219e834d67ac1
--- /dev/null
+++ b/tests/baselines/reference/typingsLookupAmd.errors.txt
@@ -0,0 +1,14 @@
+error TS5107: Option '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/umdDependencyComment2.errors.txt b/tests/baselines/reference/umdDependencyComment2.errors.txt
index 1536784b8cea0..e408be858eade 100644
--- a/tests/baselines/reference/umdDependencyComment2.errors.txt
+++ b/tests/baselines/reference/umdDependencyComment2.errors.txt
@@ -1,6 +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.
 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 d1fcb77a36b6e..3aed21ff4dcd0 100644
--- a/tests/baselines/reference/umdDependencyCommentName1.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName1.errors.txt
@@ -1,6 +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.
 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 35840c3a665b9..9e1725b6cd662 100644
--- a/tests/baselines/reference/umdDependencyCommentName2.errors.txt
+++ b/tests/baselines/reference/umdDependencyCommentName2.errors.txt
@@ -1,6 +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.
 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
new file mode 100644
index 0000000000000..d4a34f0703eec
--- /dev/null
+++ b/tests/baselines/reference/umdNamedAmdMode.errors.txt
@@ -0,0 +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.
+
+
+!!! 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 20f314758a1c8..296075556541c 100644
--- a/tests/baselines/reference/undeclaredModuleError.errors.txt
+++ b/tests/baselines/reference/undeclaredModuleError.errors.txt
@@ -1,4 +1,4 @@
-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(1,21): error TS2307: Cannot find module 'fs' or its corresponding type declarations.
 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 TS2792: Cannot find module 'fs'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
+!!! error TS2307: Cannot find module 'fs' or its corresponding type declarations.
     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 a54c85c8a8bac..f82d4ab226310 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -18,6 +18,7 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 }
 
 //// [undeclaredModuleError.js]
+<<<<<<< HEAD
 define(["require", "exports", "fs"], function (require, exports, fs) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -30,7 +31,43 @@ define(["require", "exports", "fs"], function (require, exports, fs) {
                 files.forEach((file) => {
                     var fullPath = join(IDoNotExist);
                 });
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+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);
+                });
+=======
+"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];
+    }
+}
+function instrumentFile(covFileDir, covFileName, originalFilePath) {
+    fs.readFile(originalFilePath, function () {
+        readdir(covFileDir, function () {
+        }, function (error, files) {
+            files.forEach(function (file) {
+                var fullPath = join(IDoNotExist);
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
             });
         });
-    }
-});
+    });
+}
diff --git a/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
new file mode 100644
index 0000000000000..7660f4399103c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=amd).errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..e3f296be04027
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.1(module=system).errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..a9aa99acde3ec
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.2(module=amd).errors.txt
@@ -0,0 +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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..15161cb9f73a5
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=amd).errors.txt
@@ -0,0 +1,18 @@
+error TS5107: Option '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
new file mode 100644
index 0000000000000..f037d46731a0d
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsTopLevelOfModule.3(module=system).errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..6410038d9075c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..6410038d9075c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..6410038d9075c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c0d483fd76b74
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c0d483fd76b74
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c0d483fd76b74
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..56a1dd4015895
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es2015).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..56a1dd4015895
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..56a1dd4015895
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=esnext).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..336ca1f5ff380
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es2015).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..336ca1f5ff380
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..336ca1f5ff380
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=esnext).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..25f652aa4c866
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..25f652aa4c866
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..25f652aa4c866
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..ce1fcbdf5588a
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..ce1fcbdf5588a
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..ce1fcbdf5588a
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..2cdefbe879ab6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..2cdefbe879ab6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..2cdefbe879ab6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..5dcb10fe6e706
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..5dcb10fe6e706
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..5dcb10fe6e706
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..17ee7bda8e28c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..17ee7bda8e28c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..17ee7bda8e28c
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..2b2a58dae5285
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..2b2a58dae5285
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..2b2a58dae5285
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..00ecabbfb19fe
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..00ecabbfb19fe
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..00ecabbfb19fe
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..106504df856e9
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es2015).errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..106504df856e9
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..106504df856e9
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=esnext).errors.txt
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000000000..dd484859a1bf6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..dd484859a1bf6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..dd484859a1bf6
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..f82f485b57212
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..f82f485b57212
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..f82f485b57212
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..3e18b51fe1984
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es2015).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..3e18b51fe1984
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..3e18b51fe1984
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=esnext).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..2e992776b82f8
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es2015).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..2e992776b82f8
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..2e992776b82f8
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=esnext).errors.txt
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000000..d0efc568d924e
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d0efc568d924e
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..d0efc568d924e
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..dba53684b2de4
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..dba53684b2de4
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..dba53684b2de4
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..30926090ad838
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..30926090ad838
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..30926090ad838
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..61926462d80bb
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..61926462d80bb
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..61926462d80bb
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..34f7f2659caba
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es2015).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..34f7f2659caba
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..34f7f2659caba
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=esnext).errors.txt
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 0000000000000..c84706fe23cde
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c84706fe23cde
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..c84706fe23cde
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..596c8d06d8322
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..596c8d06d8322
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..596c8d06d8322
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..66ce3c7990386
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es2015).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..66ce3c7990386
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..66ce3c7990386
--- /dev/null
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=esnext).errors.txt
@@ -0,0 +1,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.
+
+
+!!! 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
new file mode 100644
index 0000000000000..ea3caaa25cc9e
--- /dev/null
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.errors.txt
@@ -0,0 +1,29 @@
+error TS5107: Option '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 7be083f9b5d39..dc92a7cf583ab 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.types
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.types
@@ -7,6 +7,7 @@ export class A {
 
     constructor(ctor) { }
 >ctor : any
+>     : ^^^
 }
 
 export class B extends A {
@@ -25,6 +26,7 @@ export class B extends A {
 
     constructor(element: any, url: string) {
 >element : any
+>        : ^^^
 >url : string
 >    : ^^^^^^
 
@@ -34,9 +36,11 @@ export class B extends A {
 >super : typeof A
 >      : ^^^^^^^^
 >element : any
+>        : ^^^
 
         this.p1 = element;
 >this.p1 = element : any
+>                  : ^^^
 >this.p1 : number
 >        : ^^^^^^
 >this : this
@@ -44,6 +48,7 @@ export class B extends A {
 >p1 : number
 >   : ^^^^^^
 >element : any
+>        : ^^^
 
         this.p2 = url;
 >this.p2 = url : string
@@ -84,6 +89,7 @@ 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 8c173b0d85ed9..660f32f46e579 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
@@ -3,6 +3,7 @@ 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.
@@ -10,5 +11,6 @@ error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set
 !!! 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/withExportDecl.errors.txt b/tests/baselines/reference/withExportDecl.errors.txt
new file mode 100644
index 0000000000000..2b16d72472e8b
--- /dev/null
+++ b/tests/baselines/reference/withExportDecl.errors.txt
@@ -0,0 +1,63 @@
+error TS5107: Option '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 1d45b9b0fc6f7..ea8e810c7e6d7 100644
--- a/tests/baselines/reference/withExportDecl.types
+++ b/tests/baselines/reference/withExportDecl.types
@@ -3,12 +3,15 @@
 === withExportDecl.ts ===
 var simpleVar;
 >simpleVar : any
+>          : ^^^
 
 export var exportedSimpleVar;
 >exportedSimpleVar : any
+>                  : ^^^
 
 var anotherVar: any;
 >anotherVar : any
+>           : ^^^
 
 var varWithSimpleType: number;
 >varWithSimpleType : number
@@ -68,12 +71,15 @@ 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
@@ -206,6 +212,7 @@ export module m3 {
 
 export var eVar1, eVar2 = 10;
 >eVar1 : any
+>      : ^^^
 >eVar2 : number
 >      : ^^^^^^
 >10 : 10
@@ -213,6 +220,7 @@ export var eVar1, eVar2 = 10;
 
 var eVar22;
 >eVar22 : any
+>       : ^^^
 
 export var eVar3 = 10, eVar4, eVar5;
 >eVar3 : number
@@ -220,5 +228,7 @@ 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
new file mode 100644
index 0000000000000..a587af11cfe88
--- /dev/null
+++ b/tests/baselines/reference/withImportDecl.errors.txt
@@ -0,0 +1,46 @@
+error TS5107: Option '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 7fc757fb6324f..74beeb81d468b 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -4,9 +4,11 @@
 ///<reference path='withImportDecl_0.ts'/>
 var simpleVar;
 >simpleVar : any
+>          : ^^^
 
 var anotherVar: any;
 >anotherVar : any
+>           : ^^^
 
 var varWithSimpleType: number;
 >varWithSimpleType : number
@@ -42,12 +44,15 @@ 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 9c562917cdb07..853ae67b2439c 100644
--- a/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts
+++ b/tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 
 class D { }
 export = D;
diff --git a/tests/cases/compiler/augmentExportEquals1.ts b/tests/cases/compiler/augmentExportEquals1.ts
index 4479fd063b962..d814bfdcc71b2 100644
--- a/tests/cases/compiler/augmentExportEquals1.ts
+++ b/tests/cases/compiler/augmentExportEquals1.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @filename: file1.ts
 var x = 1;
 export = x;
diff --git a/tests/cases/compiler/augmentExportEquals2.ts b/tests/cases/compiler/augmentExportEquals2.ts
index 1d4c1fae35c61..b037249645ac9 100644
--- a/tests/cases/compiler/augmentExportEquals2.ts
+++ b/tests/cases/compiler/augmentExportEquals2.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 
 // @filename: file1.ts
 function foo() {}
diff --git a/tests/cases/compiler/augmentExportEquals3.ts b/tests/cases/compiler/augmentExportEquals3.ts
index 81a0e1d5448f2..e8585aba26d56 100644
--- a/tests/cases/compiler/augmentExportEquals3.ts
+++ b/tests/cases/compiler/augmentExportEquals3.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 
 // @filename: file1.ts
 function foo() {}
diff --git a/tests/cases/compiler/augmentExportEquals4.ts b/tests/cases/compiler/augmentExportEquals4.ts
index 85294682f5cc8..5e0f28ce963ed 100644
--- a/tests/cases/compiler/augmentExportEquals4.ts
+++ b/tests/cases/compiler/augmentExportEquals4.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 
 // @filename: file1.ts
 class foo {}
diff --git a/tests/cases/compiler/augmentExportEquals5.ts b/tests/cases/compiler/augmentExportEquals5.ts
index 3250a40f131ed..5fee09be93beb 100644
--- a/tests/cases/compiler/augmentExportEquals5.ts
+++ b/tests/cases/compiler/augmentExportEquals5.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 
 // @filename: express.d.ts
 
diff --git a/tests/cases/compiler/augmentExportEquals6.ts b/tests/cases/compiler/augmentExportEquals6.ts
index a0dd50c53f0fd..4b10586779a64 100644
--- a/tests/cases/compiler/augmentExportEquals6.ts
+++ b/tests/cases/compiler/augmentExportEquals6.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 
 // @filename: file1.ts
 class foo {}
diff --git a/tests/cases/compiler/badExternalModuleReference.ts b/tests/cases/compiler/badExternalModuleReference.ts
index 9b1d367e528ef..2cb7f89468c59 100644
--- a/tests/cases/compiler/badExternalModuleReference.ts
+++ b/tests/cases/compiler/badExternalModuleReference.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 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 48c68770620f7..3590ab47a4031 100644
--- a/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
+++ b/tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts
@@ -1,5 +1,5 @@
-// @target: ES5
-// @module: amd
+// @target: esnext
+// @module: commonjs
 if (true) {
     function foo() { }
     foo(); // ok
diff --git a/tests/cases/compiler/collisionExportsRequireAndAlias.ts b/tests/cases/compiler/collisionExportsRequireAndAlias.ts
index b79da28f66bc3..ccb4a6f63143e 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAlias.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAlias.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @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 563c834c79c3a..fd9ddf3977098 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 //@filename: collisionExportsRequireAndAmbientClass_externalmodule.ts
 export declare class require {
 }
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
index 5366d5511f98a..f6b9774b017e7 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 //@filename: collisionExportsRequireAndAmbientEnum_externalmodule.ts
 export declare enum require {
     _thisVal1,
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
index caabb75971a97..256b7eee67301 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 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 b94fcb0cc32df..d9fd5f86f5043 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 //@filename: collisionExportsRequireAndAmbientModule_externalmodule.ts
 export declare module require {
     export interface I {
diff --git a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
index 0e17603c92585..8f3d27e64b246 100644
--- a/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
+++ b/tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 //@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 597509075b337..ab918149621e5 100644
--- a/tests/cases/compiler/commentOnImportStatement1.ts
+++ b/tests/cases/compiler/commentOnImportStatement1.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @removeComments: false
 /* Copyright */
 
diff --git a/tests/cases/compiler/commonSourceDir5.ts b/tests/cases/compiler/commonSourceDir5.ts
index d21fa6ece08d6..02e7a00e2643d 100644
--- a/tests/cases/compiler/commonSourceDir5.ts
+++ b/tests/cases/compiler/commonSourceDir5.ts
@@ -1,5 +1,5 @@
 // @outFile: concat.js
-// @module: amd
+// @module: esnext
 // @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 1590d9289ef71..769e72c266a76 100644
--- a/tests/cases/compiler/constDeclarations-access5.ts
+++ b/tests/cases/compiler/constDeclarations-access5.ts
@@ -1,5 +1,5 @@
 // @target: ES6
-// @module: amd
+// @module: commonjs
 
 
 // @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 e64242c4b6f42..60a52f0b71101 100644
--- a/tests/cases/compiler/copyrightWithNewLine1.ts
+++ b/tests/cases/compiler/copyrightWithNewLine1.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 /*****************************
 * (c) Copyright - Important
 ****************************/
diff --git a/tests/cases/compiler/copyrightWithoutNewLine1.ts b/tests/cases/compiler/copyrightWithoutNewLine1.ts
index 6cd2c398b8a3f..a7e794b545d09 100644
--- a/tests/cases/compiler/copyrightWithoutNewLine1.ts
+++ b/tests/cases/compiler/copyrightWithoutNewLine1.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 /*****************************
 * (c) Copyright - Important
 ****************************/
diff --git a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
index 80c0f8da3c45d..a2062ef6bda75 100644
--- a/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
+++ b/tests/cases/compiler/crashIntypeCheckInvocationExpression.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: esnext
 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 63c387e97d644..5c08541773af5 100644
--- a/tests/cases/compiler/duplicateLocalVariable2.ts
+++ b/tests/cases/compiler/duplicateLocalVariable2.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: esnext
 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 3c82b745f33a7..8012d17f938e6 100644
--- a/tests/cases/compiler/duplicateSymbolsExportMatching.ts
+++ b/tests/cases/compiler/duplicateSymbolsExportMatching.ts
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 //@module: amd
 module M {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//@module: amd
+namespace M {
+=======
+//@module: commonjs
+namespace M {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
     interface I { }
 }
diff --git a/tests/cases/compiler/emitHelpersWithLocalCollisions.ts b/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
index c10e037abc934..510cfa9d3ec6b 100644
--- a/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
+++ b/tests/cases/compiler/emitHelpersWithLocalCollisions.ts
@@ -1,6 +1,5 @@
 // @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 87acc67a59b31..5fbdba5571738 100644
--- a/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
+++ b/tests/cases/compiler/es5-importHelpersAsyncFunctions.ts
@@ -2,7 +2,6 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
-// @moduleResolution: classic
 // @filename: external.ts
 export async function foo() {
 }
@@ -11,7 +10,7 @@ export async function foo() {
 async function foo() {
 }
 
-// @filename: tslib.d.ts
+// @filename: node_modules/tslib/index.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 62b976a7df750..b18b5bbb92c57 100644
--- a/tests/cases/compiler/es5ModuleInternalNamedImports.ts
+++ b/tests/cases/compiler/es5ModuleInternalNamedImports.ts
@@ -1,5 +1,5 @@
 // @target: ES5
-// @module: AMD
+// @module: commonjs
 
 export module M {
     // variable
diff --git a/tests/cases/compiler/es6ExportAssignment2.ts b/tests/cases/compiler/es6ExportAssignment2.ts
index b07427209f9f0..0b06ddbdde103 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 22a6cef420322..106438f41e45f 100644
--- a/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
+++ b/tests/cases/compiler/es6ExportClauseWithoutModuleSpecifier.ts
@@ -14,8 +14,8 @@ export module 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 2e68248d9ede5..53d040f665953 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 81f8c15320b94..fa262dfffd732 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 341a7c6c89676..62d7977f3fe90 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @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 e0f9d953afe62..c3bbf20eaa229 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 dc75c522e9c27..112d81573e59b 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 e9f8c9e5a14e3..731843ca48b6e 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 80038a40ba27b..8f8f1fe977093 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 5bc98d15de94c..016f7c670d56c 100644
--- a/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts
+++ b/tests/cases/compiler/es6ImportDefaultBindingWithExport.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @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 7df85a31d75cd..a777e39788f70 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 26bd9b6915376..932cfd926efc9 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 c3acc5447b8ea..9230eda30aaed 100644
--- a/tests/cases/compiler/exportDeclareClass1.ts
+++ b/tests/cases/compiler/exportDeclareClass1.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
     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 2d2ee4ef345e7..e96f091baa2dd 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 f23a203a54404..d0593f082df56 100644
--- a/tests/cases/compiler/exportEqualErrorType.ts
+++ b/tests/cases/compiler/exportEqualErrorType.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @Filename: exportEqualErrorType_0.ts
 module 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 f026da43aa0e3..33140bf874ef1 100644
--- a/tests/cases/compiler/exportSameNameFuncVar.ts
+++ b/tests/cases/compiler/exportSameNameFuncVar.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 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 f7a0216e8bee5..54f43adfe75bf 100644
--- a/tests/cases/compiler/exportedBlockScopedDeclarations.ts
+++ b/tests/cases/compiler/exportedBlockScopedDeclarations.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: esnext
 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 598f34c436ed4..c488187ec76b0 100644
--- a/tests/cases/compiler/fieldAndGetterWithSameName.ts
+++ b/tests/cases/compiler/fieldAndGetterWithSameName.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 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 97c65c0d9d3df..f05c2928ea119 100644
--- a/tests/cases/compiler/genericMemberFunction.ts
+++ b/tests/cases/compiler/genericMemberFunction.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: esnext
 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 b1c869e6852d4..547ccbf3e8a0d 100644
--- a/tests/cases/compiler/genericReturnTypeFromGetter1.ts
+++ b/tests/cases/compiler/genericReturnTypeFromGetter1.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 export interface A<T> {
    new (dbSet: DbSet<T>): T;
 }
diff --git a/tests/cases/compiler/giant.ts b/tests/cases/compiler/giant.ts
index 09d1787fcaada..909b02c893ae8 100644
--- a/tests/cases/compiler/giant.ts
+++ b/tests/cases/compiler/giant.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @declaration: true
 
 /*
diff --git a/tests/cases/compiler/importDeclWithClassModifiers.ts b/tests/cases/compiler/importDeclWithClassModifiers.ts
index fa83d44de32ca..da35704f3577b 100644
--- a/tests/cases/compiler/importDeclWithClassModifiers.ts
+++ b/tests/cases/compiler/importDeclWithClassModifiers.ts
@@ -1,5 +1,5 @@
-//@module: amd
-module x {
+//@module: commonjs
+namespace x {
     interface c {
     }
 }
diff --git a/tests/cases/compiler/importHelpers.ts b/tests/cases/compiler/importHelpers.ts
index becbc2eb715d0..319d7815f7e6c 100644
--- a/tests/cases/compiler/importHelpers.ts
+++ b/tests/cases/compiler/importHelpers.ts
@@ -1,7 +1,6 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
-// @moduleResolution: classic
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 // @filename: external.ts
@@ -40,7 +39,7 @@ function id<T>(x: T) {
 
 const result = id`hello world`;
 
-// @filename: tslib.d.ts
+// @filename: node_modules/tslib/index.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 7b958cda78901..943a412f162e6 100644
--- a/tests/cases/compiler/importHelpersDeclarations.ts
+++ b/tests/cases/compiler/importHelpersDeclarations.ts
@@ -1,7 +1,6 @@
 // @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 4c1dfd06ec082..c954dd466f98f 100644
--- a/tests/cases/compiler/importHelpersInIsolatedModules.ts
+++ b/tests/cases/compiler/importHelpersInIsolatedModules.ts
@@ -2,7 +2,6 @@
 // @isolatedModules: true
 // @target: es5
 // @module: commonjs
-// @moduleResolution: classic
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
 // @filename: external.ts
@@ -29,7 +28,7 @@ class C {
     }
 }
 
-// @filename: tslib.d.ts
+// @filename: node_modules/tslib/index.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 32e0e5bf3a0c0..82b1fabc45108 100644
--- a/tests/cases/compiler/importHelpersInTsx.tsx
+++ b/tests/cases/compiler/importHelpersInTsx.tsx
@@ -1,7 +1,6 @@
 // @importHelpers: true
 // @target: es5
 // @module: commonjs
-// @moduleResolution: classic
 // @jsx: react
 // @experimentalDecorators: true
 // @emitDecoratorMetadata: true
@@ -15,7 +14,7 @@ declare var React: any;
 declare var o: any;
 const x = <span {...o} />
 
-// @filename: tslib.d.ts
+// @filename: node_modules/tslib/index.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 30e67ca069be7..3994e1bb03054 100644
--- a/tests/cases/compiler/importHelpersWithLocalCollisions.ts
+++ b/tests/cases/compiler/importHelpersWithLocalCollisions.ts
@@ -1,7 +1,6 @@
 // @importHelpers: true
 // @target: es6
 // @module: commonjs, system, amd, es2015
-// @moduleResolution: classic
 // @experimentalDecorators: true
 // @filename: a.ts
 // @noTypesAndSymbols: true
@@ -13,7 +12,7 @@ declare var dec: any, __decorate: any;
 const o = { a: 1 };
 const y = { ...o };
 
-// @filename: tslib.d.ts
+// @filename: node_modules/tslib/index.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 5f944c1269678..f132cc8d8694a 100644
--- a/tests/cases/compiler/interfaceDeclaration3.ts
+++ b/tests/cases/compiler/interfaceDeclaration3.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 interface I1 { item:number; }
 
 module M1 {
diff --git a/tests/cases/compiler/interfaceImplementation6.ts b/tests/cases/compiler/interfaceImplementation6.ts
index 5d8bfdb329aea..1b36ab08b4144 100644
--- a/tests/cases/compiler/interfaceImplementation6.ts
+++ b/tests/cases/compiler/interfaceImplementation6.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 interface I1 {
     item:number;
 }
diff --git a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
index 23629661799ab..0c27d6fe168ae 100644
--- a/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 //@module: amd
 export module a {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//@module: amd
+export namespace a {
+=======
+//@module: commonjs
+export namespace a {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface I {
     }
 }
diff --git a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
index 36cfcf7e8cede..efebe8bbad26b 100644
--- a/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
+++ b/tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts
@@ -1,6 +1,16 @@
+<<<<<<< HEAD
 //@module: amd
 export module a {
     export module b {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//@module: amd
+export namespace a {
+    export namespace b {
+=======
+//@module: commonjs
+export namespace a {
+    export namespace b {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         export interface I {
             foo();
         }
diff --git a/tests/cases/compiler/moduleAugmentationGlobal8.ts b/tests/cases/compiler/moduleAugmentationGlobal8.ts
index e28b07d6bfd7a..5c00c49a8bf46 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8.ts
@@ -1,5 +1,5 @@
 // @target: es5
-// @module: amd
+// @module: esnext
 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 9031e4742b083..e4900a9be4c5e 100644
--- a/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
+++ b/tests/cases/compiler/moduleAugmentationGlobal8_1.ts
@@ -1,5 +1,5 @@
 // @target: es5
-// @module: amd
+// @module: esnext
 namespace A {
     global {
         interface Array<T> { x }
diff --git a/tests/cases/compiler/moduleExports1.ts b/tests/cases/compiler/moduleExports1.ts
index 3533c6bea6c36..adaa1594c04bc 100644
--- a/tests/cases/compiler/moduleExports1.ts
+++ b/tests/cases/compiler/moduleExports1.ts
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 //@module: amd
 export module TypeScript.Strasse.Street {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+//@module: amd
+export namespace TypeScript.Strasse.Street {
+=======
+//@module: commonjs
+export namespace TypeScript.Strasse.Street {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 	export class Rue {
 		public address:string;
 	}	
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
index f663871cbdb36..8a90fd5fed4a8 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 //@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 c127c3ee7866d..d215069686965 100644
--- a/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
+++ b/tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @Filename: propertyIdentityWithPrivacyMismatch_0.ts
 declare module 'mod1' {
     class Foo {
diff --git a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
index 1b28dbf22f7ab..8823d43a02fd4 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @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 32b76ecc55114..55dd02da674a6 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @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 bdaaecee25b6b..bbf5d73db87eb 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @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 70536b9b8a2ca..2e7398dc02a56 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts
@@ -1,6 +1,6 @@
-//@module: amd
+//@module: commonjs
 // @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 e66f23f2ba10a..faa1129fd696a 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts
@@ -1,10 +1,10 @@
-//@module: amd
+//@module: commonjs
 // @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 7a1a819521679..54f1c79e4c94a 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts
@@ -1,14 +1,14 @@
-//@module: amd
+//@module: commonjs
 // @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 34e7e5f839279..b6eeaf94687d6 100644
--- a/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
+++ b/tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts
@@ -1,15 +1,15 @@
-//@module: amd
+//@module: commonjs
 // @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/staticInstanceResolution5.ts b/tests/cases/compiler/staticInstanceResolution5.ts
index ed34dbd535f27..c2cd884bf1af7 100644
--- a/tests/cases/compiler/staticInstanceResolution5.ts
+++ b/tests/cases/compiler/staticInstanceResolution5.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 // @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 306349454c6f5..badf43d900a61 100644
--- a/tests/cases/compiler/topLevelLambda4.ts
+++ b/tests/cases/compiler/topLevelLambda4.ts
@@ -1,2 +1,2 @@
-//@module: amd
+//@module: esnext
 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 be7e40453f60d..205a703ae7f0b 100644
--- a/tests/cases/compiler/typeAliasDeclarationEmit.ts
+++ b/tests/cases/compiler/typeAliasDeclarationEmit.ts
@@ -1,5 +1,5 @@
 // @target: ES5
-// @module: AMD
+// @module: commonjs
 // @declaration: true
 
 export type callback<T> = () => T;
diff --git a/tests/cases/compiler/typeUsedAsValueError2.ts b/tests/cases/compiler/typeUsedAsValueError2.ts
index dd89225ef96e0..1e8c389694489 100644
--- a/tests/cases/compiler/typeUsedAsValueError2.ts
+++ b/tests/cases/compiler/typeUsedAsValueError2.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @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 98b54e41c5a0b..5a78e48b411a9 100644
--- a/tests/cases/compiler/undeclaredModuleError.ts
+++ b/tests/cases/compiler/undeclaredModuleError.ts
@@ -1,4 +1,4 @@
-//@module: amd
+//@module: commonjs
 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 027dc4d300869..f45f4549fbf74 100644
--- a/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts
+++ b/tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts
@@ -1,2 +1,2 @@
-//@module: amd
+//@module: commonjs
 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 82dc5693d42ba..6fb0df2290110 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: tslib.d.ts
+// @filename: node_modules/tslib/index.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 b1261a039e563..1d59a8164faa1 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: tslib.d.ts
+// @filename: node_modules/tslib/index.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/externalModules/exportAssignmentAndDeclaration.ts b/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
index 9c9ee883fd9ca..1106f396f3eef 100644
--- a/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
+++ b/tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @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 5e7d43f0ef82f..e3f66c4ed0ed6 100644
--- a/tests/cases/conformance/externalModules/importNonExternalModule.ts
+++ b/tests/cases/conformance/externalModules/importNonExternalModule.ts
@@ -1,4 +1,4 @@
-// @module: amd
+// @module: commonjs
 // @Filename: foo_0.ts
 module foo {
 	export var answer = 42;
diff --git a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
index 8bbf3142e1995..c200b17ef3598 100644
--- a/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
+++ b/tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts
@@ -1,5 +1,5 @@
 // @target: esnext
-// @module: system
+// @module: commonjs
 
 // @filename: index.ts
 // await disallowed in import=
diff --git a/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts b/tests/cases/conformance/importDefer/importDeferInvalidDefault.ts
index d3f02c8d13926..ba6972e84899f 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 078f5a132223f..a1b3a006fa7f5 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 5cf5ef7c544ae..788c94f759701 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 a12aa3529e3a3..9c7a38771bb9b 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 759cc28d322fb..5f80c874e321e 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution10.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: amd
+//@module: commonjs
 
 //@filename: react.d.ts
 declare module JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
index fdff3c36fc754..ce37084495fcc 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution11.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: amd
+//@module: commonjs
 
 //@filename: react.d.ts
 declare module JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
index 1e4418e7fba37..79570d65f25d9 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution14.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: amd
+//@module: commonjs
 
 //@filename: react.d.ts
 declare module JSX {
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
index 9768d65d000e3..c7d8c8872f535 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution9.tsx
@@ -1,5 +1,5 @@
 //@jsx: preserve
-//@module: amd
+//@module: commonjs
 
 //@filename: react.d.ts
 declare module JSX {
diff --git a/tests/cases/conformance/jsx/tsxElementResolution19.tsx b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
index 23e503ae962e7..67850424658fb 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution19.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
@@ -1,5 +1,5 @@
 //@jsx: react
-//@module: amd
+//@module: commonjs
 
 //@filename: react.d.ts
 declare module "react" {
diff --git a/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx b/tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx
index b2b6f101cbbee..e8733600f0457 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: amd
+// @module: commonjs
 // @noLib: true
 // @strictNullChecks: true
 // @skipLibCheck: true
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx
index d5c247aa22412..79855c7279138 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: amd
+// @module: commonjs
 // @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 b32393c44ceb4..61d2297ccd6e0 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: amd
+// @module: commonjs
 // @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 eb8f3f3d12890..5cee1a4b79645 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: amd
+// @module: commonjs
 // @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 6cd88999425b3..6982dbc7a0280 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: amd
+// @module: commonjs
 // @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 53171833d9def..ca309d23a1255 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: amd
+// @module: commonjs
 // @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 c9eb402c800c5..c07a80e83e337 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import3.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import3.ts
@@ -1,6 +1,5 @@
 /// <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 b741831bce96b..c71b6d3230dba 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import6.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import6.ts
@@ -1,6 +1,5 @@
 /// <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 1ce110f056a0b..02f4334462668 100644
--- a/tests/cases/fourslash/codeFixCalledES2015Import9.ts
+++ b/tests/cases/fourslash/codeFixCalledES2015Import9.ts
@@ -1,6 +1,5 @@
 /// <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/completionListForTransitivelyExportedMembers04.ts b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
index f6052fe030cba..bd37d3d054e6f 100644
--- a/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
+++ b/tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts
@@ -1,5 +1,4 @@
 ///<reference path="fourslash.ts" />
-// @ModuleResolution: classic
 
 // @Filename: A.ts
 ////export interface I1 { one: number }
@@ -25,11 +24,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 48ed52ae51517..999d8323746de 100644
--- a/tests/cases/fourslash/completionListInImportClause01.ts
+++ b/tests/cases/fourslash/completionListInImportClause01.ts
@@ -1,20 +1,18 @@
 /// <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 85d45299f3694..a8874a0accecd 100644
--- a/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
+++ b/tests/cases/fourslash/completionPropertyShorthandForObjectLiteral5.ts
@@ -1,3 +1,4 @@
+/// <reference path="fourslash.ts" />
 // @module: esnext
 
 // @Filename: /a.ts
@@ -9,7 +10,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 5f67a7d4d6301..6aa071d3ca508 100644
--- a/tests/cases/fourslash/completionsImportBaseUrl.ts
+++ b/tests/cases/fourslash/completionsImportBaseUrl.ts
@@ -19,7 +19,7 @@ verify.completions({
     marker: "",
     includes: {
         name: "foo",
-        source: "/src/a",
+        source: "./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 a7a2ffad06fef..568b1fb5e9026 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: "/src/foo-bar",
+            source: "./foo-bar",
             sourceDisplay: "./foo-bar",
             text: "(property) default: 0",
             kind: "property",
@@ -36,7 +36,7 @@ verify.completions(
 );
 verify.applyCodeActionFromCompletion("1", {
     name: "fooBar",
-    source: "/src/foo-bar",
+    source: "./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 3459a342d10fb..18c877f6a0ee8 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 f4db7061043b7..dd91eea6ca853 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 436549ee6b14b..069e27736c190 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("0", {
+verify.applyCodeActionFromCompletion("1", {
     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 e2227319a8e49..4b48eaa86a962 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 d7433b41492db..a54e6a14503b2 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 d4566dd5dfcf9..be1edc1650fb4 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 87b167d338927..6b1cd2c9c7627 100644
--- a/tests/cases/fourslash/completionsImport_notFromIndex.ts
+++ b/tests/cases/fourslash/completionsImport_notFromIndex.ts
@@ -1,7 +1,5 @@
 /// <reference path="fourslash.ts" />
 
-// @moduleResolution: node10
-
 // @Filename: /src/a.ts
 ////export const x = 0;
 
@@ -22,11 +20,8 @@ for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a
         marker,
         includes: {
             name: "x",
-            source: "/src/a",
+            source: sourceDisplay,
             sourceDisplay,
-            text: "const x: 0",
-            kind: "const",
-            kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
         },
@@ -34,7 +29,7 @@ for (const [marker, sourceDisplay] of [["0", "./src"], ["1", "./a"], ["2", "../a
     });
     verify.applyCodeActionFromCompletion(marker, {
         name: "x",
-        source: "/src/a",
+        source: sourceDisplay,
         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 e6a882f712539..20b86ec2a5d32 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 aaea053032775..3bdd5e326bba1 100644
--- a/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts
+++ b/tests/cases/fourslash/completionsImport_ofAlias_preferShortPath.ts
@@ -2,7 +2,6 @@
 
 // Test that the completion is for the shortest path, even if that's a re-export.
 
-// @moduleResolution: node10
 // @module: commonJs
 // @noLib: true
 
@@ -20,10 +19,10 @@ verify.completions({
     exact: completion.globalsPlus([
         {
             name: "foo",
-            source: "/foo/lib/foo",
+            source: "./foo",
             sourceDisplay: "./foo",
-            text: "const foo: 0",
-            kind: "const",
+            text: "(alias) const foo: 0\nexport foo",
+            kind: "alias",
             kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
@@ -33,7 +32,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "/foo/lib/foo",
+    source: "./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 a06fc247e961b..15d38586c4c52 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 0216f5730b556..1a84942123b93 100644
--- a/tests/cases/fourslash/completionsImport_reExportDefault.ts
+++ b/tests/cases/fourslash/completionsImport_reExportDefault.ts
@@ -1,7 +1,6 @@
 /// <reference path="fourslash.ts" />
 
 // @module: esnext
-// @moduleResolution: node10
 
 // @Filename: /a/b/impl.ts
 ////export default function foo() {}
@@ -17,10 +16,10 @@ verify.completions({
     exact: completion.globalsPlus([
         {
             name: "foo",
-            source: "/a/b/impl",
+            source: "./a",
             sourceDisplay: "./a",
-            text: "function foo(): void",
-            kind: "function",
+            text: "(alias) function foo(): void\nexport foo",
+            kind: "alias",
             kindModifiers: "export",
             hasAction: true,
             sortText: completion.SortText.AutoImportSuggestions
@@ -30,7 +29,7 @@ verify.completions({
 });
 verify.applyCodeActionFromCompletion("", {
     name: "foo",
-    source: "/a/b/impl",
+    source: "./a",
     description: `Add import from "./a"`,
     newFileContent: `import { foo } from "./a";
 
diff --git a/tests/cases/fourslash/completionsUniqueSymbol_import.ts b/tests/cases/fourslash/completionsUniqueSymbol_import.ts
index dbdaec369ac4e..ef57d17ee7a20 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/getPreProcessedFile.ts b/tests/cases/fourslash/getPreProcessedFile.ts
index a33a6c9a470ce..348c2bba52d29 100644
--- a/tests/cases/fourslash/getPreProcessedFile.ts
+++ b/tests/cases/fourslash/getPreProcessedFile.ts
@@ -1,5 +1,6 @@
 /// <reference path="fourslash.ts" />
-// @ModuleResolution: classic
+
+// @moduleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }
diff --git a/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts b/tests/cases/fourslash/noImportCompletionsInOtherJavaScriptFile.ts
index 6051a5d80fc7a..fd2d095d4e5ce 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: "/node_modules/foo/index",
-            sourceDisplay: "./node_modules/foo/index",
+            source: "foo",
+            sourceDisplay: "foo",
             text: "const fail: number",
             kind: "const",
             kindModifiers: "export,declare",
@@ -40,8 +40,8 @@ goTo.eachMarker(() => {
     verify.completions({
         includes: {
             name: "fail",
-            source: "/node_modules/foo/index",
-            sourceDisplay: "./node_modules/foo/index",
+            source: "foo",
+            sourceDisplay: "foo",
             text: "const fail: number",
             kind: "const",
             kindModifiers: "export,declare",
diff --git a/tests/cases/fourslash/server/autoImportProvider3.ts b/tests/cases/fourslash/server/autoImportProvider3.ts
index 106fd20a5e112..1f6024116c24a 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: "/home/src/workspaces/project/node_modules/package-dependency/index",
+    source: "package-dependency",
     sortText: completion.SortText.AutoImportSuggestions,
     isPackageJsonImport: true
   }, {
     name: "CommonDependency",
     hasAction: true,
-    source: "/home/src/workspaces/project/node_modules/common-dependency/index",
+    source: "common-dependency",
     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 153bc7ae4ece0..83938188ccb4f 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: "/home/src/workspaces/project/undefinedAlias"
+     source: "./undefinedAlias"
   }],
   preferences: {
     includeCompletionsForModuleExports: true,
@@ -34,7 +34,7 @@ verify.completions({
     name: "x",
      hasAction: true,
      sortText: completion.SortText.AutoImportSuggestions,
-     source: "/home/src/workspaces/project/undefinedAlias"
+     source: "./undefinedAlias"
   }],
   preferences: {
     includeCompletionsForModuleExports: true,
diff --git a/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts b/tests/cases/fourslash/server/importSuggestionsCache_moduleAugmentation.ts
index 4eb82b806df39..4241243654821 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: "/home/src/workspaces/project/node_modules/@types/react/index",
+          source: "react",
           hasAction: true,
           sortText: completion.SortText.AutoImportSuggestions,
       },

From 70795af8d8d61dab9aef443f6bddbfc177563170 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Tue, 30 Sep 2025 14:03:17 -0700
Subject: [PATCH 2/3] Deprecate baseUrl (#62509)

---
 src/compiler/diagnosticMessages.json          |   4 +
 src/compiler/program.ts                       |  35 +-
 src/compiler/types.ts                         |   1 +
 .../allowSyntheticDefaultImports3.errors.txt  |  12 -
 .../allowSyntheticDefaultImports6.errors.txt  |  12 -
 .../allowSyntheticDefaultImports8.errors.txt  |  12 -
 ...ntExternalModuleInAnotherExternalModule.js |  24 +-
 ...leWithInternalImportDeclaration.errors.txt |   2 +-
 ...ithoutInternalImportDeclaration.errors.txt |   2 +-
 ...tInsideNonAmbientExternalModule.errors.txt |   2 +-
 .../amdDependencyCommentName4.errors.txt      |  14 +-
 ...amdImportNotAsPrimaryExpression.errors.txt |   2 +-
 tests/baselines/reference/api/typescript.d.ts |   1 +
 .../reference/augmentExportEquals1.js         |  16 +-
 .../reference/augmentExportEquals2.js         |  16 +-
 .../reference/augmentExportEquals3.js         |  89 +-
 .../reference/augmentExportEquals4.js         | 117 +--
 .../reference/augmentExportEquals5.js         |  20 +-
 .../reference/augmentExportEquals6.js         | 143 +--
 .../augmentedTypesExternalModule1.errors.txt  |   2 +-
 ...ollisionExportsRequireAndModule.errors.txt |  10 +-
 ...sRequireAndUninstantiatedModule.errors.txt |   4 +-
 .../commentsDottedModuleName.errors.txt       |   2 +-
 .../commentsExternalModules.errors.txt        |   8 +-
 .../commentsExternalModules2.errors.txt       |   8 +-
 .../commentsMultiModuleMultiFile.errors.txt   |   6 +-
 .../constEnumMergingWithValues1.errors.txt    |   2 +-
 .../constEnumMergingWithValues2.errors.txt    |   2 +-
 .../constEnumMergingWithValues3.errors.txt    |   2 +-
 .../constEnumMergingWithValues4.errors.txt    |   4 +-
 .../constEnumMergingWithValues5.errors.txt    |   2 +-
 ...llyTypedStringLiteralsInJsxAttributes02.js |  64 +-
 .../crashIntypeCheckInvocationExpression.js   |  30 +-
 .../declFileExportImportChain.errors.txt      |   4 +-
 .../declFileExportImportChain2.errors.txt     |   4 +-
 .../declarationEmitMonorepoBaseUrl.errors.txt |  59 ++
 ...larationEmitPathMappingMonorepo.errors.txt |  34 +
 ...arationEmitPathMappingMonorepo2.errors.txt |  51 +
 ...tPrefersPathKindBasedOnBundling.errors.txt |  24 +
 ...onEmitPrefersPathKindBasedOnBundling.types |   1 +
 ...nEmitPrefersPathKindBasedOnBundling2.types |   1 +
 ...dNotShortCircuitBaseTypeBinding.errors.txt |  18 +-
 .../reference/duplicateLocalVariable2.js      | 114 +--
 .../duplicateSymbolsExportMatching.errors.txt |  56 +-
 .../duplicateSymbolsExportMatching.js         |  96 +-
 .../duplicateSymbolsExportMatching.symbols    |  86 +-
 .../duplicateSymbolsExportMatching.types      |   6 +
 .../es5ModuleInternalNamedImports.js          |  74 +-
 .../reference/es6ExportAll.errors.txt         |   4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |  12 -
 ...BindingFollowedWithNamespaceBindingDts1.js |  12 -
 .../es6ImportDefaultBindingWithExport.js      |  25 +-
 .../es6ImportWithoutFromClause.errors.txt     |  11 -
 ...FromClauseNonInstantiatedModule.errors.txt |  11 -
 .../exportAssignmentAndDeclaration.js         |  35 +-
 ...exportAssignmentCircularModules.errors.txt |   6 +-
 .../exportAssignmentError.errors.txt          |   2 +-
 .../exportAssignmentInternalModule.errors.txt |   2 +-
 ...exportAssignmentTopLevelClodule.errors.txt |   2 +-
 ...xportAssignmentTopLevelEnumdule.errors.txt |   2 +-
 ...exportAssignmentTopLevelFundule.errors.txt |   2 +-
 ...ortAssignmentTopLevelIdentifier.errors.txt |   2 +-
 ...WithImportStatementPrivacyError.errors.txt |   4 +-
 ...lowSyntheticDefaultImportsError.errors.txt |   8 +-
 ...outAllowSyntheticDefaultImportsError.types |   4 +-
 .../exportEqualNamespaces.errors.txt          |   2 +-
 ...tCanSubstituteConstEnumForValue.errors.txt |   4 +-
 .../exportedBlockScopedDeclarations.js        |  62 +-
 .../exportsAndImports1-amd.errors.txt         |   4 +-
 .../exportsAndImports3-amd.errors.txt         |   4 +-
 .../reference/fieldAndGetterWithSameName.js   |  42 +-
 .../reference/genericMemberFunction.js        | 113 +--
 .../reference/genericReturnTypeFromGetter1.js |  44 +-
 tests/baselines/reference/giant.js            | 910 ++----------------
 .../importDeclWithClassModifiers.errors.txt   |   2 +-
 .../reference/importDeclWithClassModifiers.js |   2 +-
 .../importDeclWithClassModifiers.symbols      |   4 +-
 .../importDeclWithClassModifiers.types        |   2 +-
 .../baselines/reference/importHelpers.symbols |  90 +-
 .../importHelpersInIsolatedModules.symbols    |  90 +-
 .../reference/importHelpersInTsx.symbols      |  90 +-
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...As(esmoduleinterop=false,module=amd).types |   1 +
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...esmoduleinterop=false,module=system).types |   1 +
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...lt(esmoduleinterop=false,module=amd).types |   1 +
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...esmoduleinterop=false,module=system).types |   1 +
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...moduleinterop=false,module=amd).errors.txt |   2 -
 ...As(esmoduleinterop=false,module=amd).types |   1 +
 ...uleinterop=false,module=system).errors.txt |   2 -
 ...esmoduleinterop=false,module=system).types |   1 +
 ...tMeta(module=system,target=es5).errors.txt |  12 +-
 ...ta(module=system,target=esnext).errors.txt |  12 +-
 ...import_reference-exported-alias.errors.txt |   4 +-
 .../import_reference-to-type-alias.errors.txt |   4 +-
 .../importedAliasesInTypePositions.errors.txt |   4 +-
 .../importedModuleClassNameClash.errors.txt   |   2 +-
 .../reference/interfaceDeclaration3.js        | 174 +---
 .../reference/interfaceImplementation6.js     |  80 +-
 ...mInsideTopLevelModuleWithExport.errors.txt |   2 +-
 ...sideTopLevelModuleWithoutExport.errors.txt |   2 +-
 ...nInsideTopLevelModuleWithExport.errors.txt |   2 +-
 ...duleInsideLocalModuleWithExport.errors.txt |   6 +-
 ...sideTopLevelModuleWithoutExport.errors.txt |   4 +-
 ...faceInsideLocalModuleWithExport.errors.txt |   4 +-
 ...eInsideLocalModuleWithoutExport.errors.txt |   4 +-
 ...lModuleWithoutExportAccessError.errors.txt |  22 +-
 ...sideLocalModuleWithoutExportAccessError.js |   6 +
 ...ocalModuleWithoutExportAccessError.symbols |  22 +-
 ...eLocalModuleWithoutExportAccessError.types |   6 +
 ...sideTopLevelModuleWithoutExport.errors.txt |   2 +-
 ...lModuleWithoutExportAccessError.errors.txt |  24 +-
 ...sideLocalModuleWithoutExportAccessError.js |   8 +
 ...ocalModuleWithoutExportAccessError.symbols |  38 +-
 ...eLocalModuleWithoutExportAccessError.types |   8 +
 ...eInsideTopLevelModuleWithExport.errors.txt |   4 +-
 ...sVarInsideLocalModuleWithExport.errors.txt |   4 +-
 ...rInsideLocalModuleWithoutExport.errors.txt |   4 +-
 ...rInsideTopLevelModuleWithExport.errors.txt |   2 +-
 .../reference/moduleExportAliasImported.types |   4 +-
 .../reference/moduleExports1.errors.txt       |  24 +-
 tests/baselines/reference/moduleExports1.js   |  64 +-
 .../reference/moduleExports1.symbols          |  34 +-
 .../baselines/reference/moduleExports1.types  |   6 +
 ...geIdWithRelativeAndAbsolutePath.errors.txt |  55 ++
 ...olutionWithExtensions_withPaths.errors.txt |   9 +-
 ...uleResolutionWithSuffixes_empty.errors.txt |   2 +
 ...lutionWithSuffixes_notSpecified.errors.txt |   2 +
 ...oduleResolutionWithSuffixes_one.errors.txt |   2 +
 ...ResolutionWithSuffixes_oneBlank.errors.txt |   2 +
 ...olutionWithSuffixes_oneNotFound.errors.txt |   2 +
 ...Suffixes_one_dirModuleWithIndex.errors.txt |   2 +
 ...WithSuffixes_one_externalModule.errors.txt |   2 +
 ...Suffixes_one_externalModulePath.errors.txt |   2 +
 ...es_one_externalModule_withPaths.errors.txt |   9 +-
 ...thSuffixes_one_externalTSModule.errors.txt |   2 +
 ...lutionWithSuffixes_one_jsModule.errors.txt |   2 +
 ...tionWithSuffixes_one_jsonModule.errors.txt |   2 +
 ...nWithSuffixes_threeLastIsBlank1.errors.txt |   2 +
 ...nWithSuffixes_threeLastIsBlank2.errors.txt |   2 +
 ...nWithSuffixes_threeLastIsBlank3.errors.txt |   2 +
 ...nWithSuffixes_threeLastIsBlank4.errors.txt |   2 +
 ...e10AlternateResult_noResolution.errors.txt |   2 +
 .../node10Alternateresult_noTypes.errors.txt  |   2 +
 .../reference/node10IsNode_node.errors.txt    |   2 +
 ...onCompat(moduleresolution=node).errors.txt |   2 +
 ...gBasedModuleResolution2_classic.errors.txt |  15 +-
 ...pingBasedModuleResolution2_node.errors.txt |   7 +-
 ...appingBasedModuleResolution3_classic.types |   1 +
 ...pingBasedModuleResolution3_node.errors.txt |  21 +
 ...thMappingBasedModuleResolution3_node.types |   1 +
 ...appingBasedModuleResolution4_classic.types |   1 +
 ...pingBasedModuleResolution4_node.errors.txt |  29 +
 ...thMappingBasedModuleResolution4_node.types |   1 +
 ...appingBasedModuleResolution5_classic.types |   1 +
 ...pingBasedModuleResolution5_node.errors.txt |  47 +
 ...thMappingBasedModuleResolution5_node.types |   1 +
 ...appingBasedModuleResolution7_classic.types |   2 +
 ...pingBasedModuleResolution7_node.errors.txt |  54 ++
 ...thMappingBasedModuleResolution7_node.types |   2 +
 ...pingBasedModuleResolution8_node.errors.txt |  25 +
 ...lution_rootImport_aliasWithRoot.errors.txt |  29 +
 ...liasWithRoot_differentRootTypes.errors.txt |  53 +
 ...t_aliasWithRoot_multipleAliases.errors.txt |  30 +
 ...port_aliasWithRoot_realRootFile.errors.txt |  29 +
 ...tion_rootImport_noAliasWithRoot.errors.txt |  29 +
 ...rt_noAliasWithRoot_realRootFile.errors.txt |  29 +
 ...dModuleResolution_withExtension.errors.txt |  30 +
 ...eResolution_withExtensionInName.errors.txt |  27 +
 ...ithExtension_MapedToNodeModules.errors.txt |  25 +
 ...tion_withExtension_failedLookup.errors.txt |   7 +-
 .../pathMappingInheritedBaseUrl.errors.txt    |  31 +
 .../reference/pathsValidation1.errors.txt     |   7 +-
 .../reference/pathsValidation2.errors.txt     |   7 +-
 .../reference/pathsValidation3.errors.txt     |   7 +-
 .../reference/pathsValidation4.errors.txt     |   7 +-
 ...heckAnonymousFunctionParameter2.errors.txt |   4 +-
 ...mentOnExportedGenericInterface2.errors.txt |   2 +-
 .../reference/privacyGetter.errors.txt        |   4 +-
 .../reference/privacyGloFunc.errors.txt       |   4 +-
 ...nalReferenceImportWithoutExport.errors.txt |  16 +-
 ...mbientExternalModuleImportWithoutExport.js |  62 +-
 ...ternalReferenceImportWithExport.errors.txt |  12 +-
 ...nalReferenceImportWithoutExport.errors.txt |  12 +-
 .../baseline3/amd/baseline3.errors.txt        |   4 +-
 .../baseline3/node/baseline3.errors.txt       |   4 +-
 .../declarationsExportNamespace.errors.txt    |   2 +-
 .../declarationsExportNamespace.errors.txt    |   2 +-
 .../declarationsImportedInPrivate.errors.txt  |   2 +-
 .../declarationsImportedInPrivate.errors.txt  |   2 +-
 ...declarationsMultipleTimesImport.errors.txt |   2 +-
 ...declarationsMultipleTimesImport.errors.txt |   2 +-
 ...ionsMultipleTimesMultipleImport.errors.txt |   2 +-
 ...ionsMultipleTimesMultipleImport.errors.txt |   2 +-
 .../amd/declarationsSimpleImport.errors.txt   |   2 +-
 .../node/declarationsSimpleImport.errors.txt  |   2 +-
 .../amd/extReferencingExtAndInt.errors.txt    |   2 +-
 .../node/extReferencingExtAndInt.errors.txt   |   2 +-
 .../amd/moduleMergingOrdering1.errors.txt     |   4 +-
 .../node/moduleMergingOrdering1.errors.txt    |   4 +-
 .../amd/moduleMergingOrdering2.errors.txt     |   4 +-
 .../node/moduleMergingOrdering2.errors.txt    |   4 +-
 .../amd/nestedReferenceTags.errors.txt        |   4 +-
 .../node/nestedReferenceTags.errors.txt       |   4 +-
 .../noDefaultLib/amd/noDefaultLib.errors.txt  |   4 +
 .../noDefaultLib/node/noDefaultLib.errors.txt |   2 +
 .../amd/nodeModulesImportHigher.errors.txt    |   2 +
 .../node/nodeModulesImportHigher.errors.txt   |   2 +
 .../nodeModulesMaxDepthExceeded.errors.txt    |   2 +
 .../nodeModulesMaxDepthExceeded.errors.txt    |   2 +
 .../nodeModulesMaxDepthIncreased.errors.txt   |   2 +
 .../nodeModulesMaxDepthIncreased.errors.txt   |   2 +
 ...OnImportedModuleSimpleReference.errors.txt |   4 +-
 ...OnImportedModuleSimpleReference.errors.txt |   4 +-
 .../prologueEmit/amd/prologueEmit.errors.txt  |   2 +-
 .../quotesInFileAndDirectoryNames.errors.txt  |   2 +-
 .../quotesInFileAndDirectoryNames.errors.txt  |   2 +-
 .../amd/referencePathStatic.errors.txt        |   2 +-
 .../node/referencePathStatic.errors.txt       |   2 +-
 .../propertyIdentityWithPrivacyMismatch.js    |  48 +-
 ...siveExportAssignmentAndFindAliasedType1.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType2.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType3.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType4.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType5.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType6.js |  21 +-
 ...siveExportAssignmentAndFindAliasedType7.js |  21 +-
 .../relativePathToDeclarationFile.errors.txt  |   4 +-
 .../reference/requireEmitSemicolon.errors.txt |   4 +-
 ...ResolveJsonModuleAndPathMapping.errors.txt |   7 +-
 .../requireOfJsonFile_PathMapping.errors.txt  |  25 +
 .../resolutionModeTripleSlash4.errors.txt     |   2 +
 .../resolutionModeTripleSlash5.errors.txt     |   2 +
 .../reference/staticInstanceResolution5.js    |  62 +-
 .../systemDefaultImportCallable.errors.txt    |   2 +-
 .../reference/systemModule7.errors.txt        |   4 +-
 .../reference/systemModule9.errors.txt        |   8 +-
 ...systemModuleAmbientDeclarations.errors.txt |   2 +-
 .../systemModuleConstEnums.errors.txt         |   2 +-
 ...leConstEnumsSeparateCompilation.errors.txt |   2 +-
 .../systemModuleDeclarationMerging.errors.txt |   6 +-
 ...mModuleNonTopLevelModuleMembers.errors.txt |   6 +-
 tests/baselines/reference/topLevelLambda4.js  |  22 +-
 ...ion (verbatimModuleSyntax=true).errors.txt |   2 +
 ...ModuleSyntax=true).oldTranspile.errors.txt |   2 +
 ... transpile with CommonJS option.errors.txt |   2 +
 ...th CommonJS option.oldTranspile.errors.txt |   2 +
 ...en transpile with System option.errors.txt |   2 +
 ...with System option.oldTranspile.errors.txt |   2 +
 ...Url (verbatimModuleSyntax=true).errors.txt |   8 +
 ...ModuleSyntax=true).oldTranspile.errors.txt |   8 +
 .../Supports setting baseUrl.errors.txt       |   8 +
 ...ts setting baseUrl.oldTranspile.errors.txt |   8 +
 ...ion (verbatimModuleSyntax=true).errors.txt |   2 +
 ...ModuleSyntax=true).oldTranspile.errors.txt |   2 +
 ...pports setting moduleResolution.errors.txt |   2 +
 ...g moduleResolution.oldTranspile.errors.txt |   2 +
 .../modules-and-globals-mixed-in-amd.js       |  48 +-
 .../prepend-reports-deprecation-error.js      |  32 +-
 ...e-resolution-finds-original-source-file.js |  32 +-
 .../different-options-with-incremental.js     | 176 +---
 .../commandLine/outFile/different-options.js  | 128 +--
 ...ndline-with-declaration-and-incremental.js |  64 +-
 ...mitDeclarationOnly-false-on-commandline.js |  96 +-
 ...ndline-with-declaration-and-incremental.js | 128 +--
 .../emitDeclarationOnly-on-commandline.js     | 514 +---------
 .../reports-syntax-errors-in-config-file.js   | 116 +--
 ...-dts-generation-errors-with-incremental.js |  16 +-
 ...d-inferred-type-from-referenced-project.js |  49 +-
 .../tsbuild/extends/configDir-template.js     |  16 +-
 .../outFile/detects-deleted-file.js           |  64 +-
 ...project-correctly-with-preserveSymlinks.js |  29 +-
 ...-file-from-referenced-project-correctly.js |  29 +-
 .../outFile/dts-errors-with-incremental.js    |  80 +-
 .../semantic-errors-with-incremental.js       |  80 +-
 .../outFile/syntax-errors-with-incremental.js |  64 +-
 .../noEmit/outFile/changes-composite.js       |  96 +-
 .../changes-incremental-declaration.js        |  96 +-
 .../noEmit/outFile/changes-incremental.js     |  96 +-
 .../changes-with-initial-noEmit-composite.js  |  80 +-
 ...-initial-noEmit-incremental-declaration.js |  80 +-
 ...changes-with-initial-noEmit-incremental.js |  80 +-
 ...th-incremental-as-modules-discrepancies.js | 106 +-
 ...ble-changes-with-incremental-as-modules.js |  94 +-
 ...tion-enable-changes-with-multiple-files.js | 120 +--
 ...th-incremental-as-modules-discrepancies.js |   8 +-
 .../dts-errors-with-incremental-as-modules.js |  80 +-
 ...dts-enabled-with-incremental-as-modules.js |  72 +-
 ...ntic-errors-with-incremental-as-modules.js |  80 +-
 ...ntax-errors-with-incremental-as-modules.js |  32 +-
 ...rrors-with-declaration-with-incremental.js | 118 +--
 .../outFile/dts-errors-with-declaration.js    | 114 ---
 .../outFile/dts-errors-with-incremental.js    |  82 +-
 .../noEmitOnError/outFile/dts-errors.js       |  50 -
 ...rrors-with-declaration-with-incremental.js |  78 +-
 .../semantic-errors-with-declaration.js       |  90 --
 .../semantic-errors-with-incremental.js       |  54 +-
 .../noEmitOnError/outFile/semantic-errors.js  |  66 --
 ...rrors-with-declaration-with-incremental.js |  82 +-
 .../outFile/syntax-errors-with-declaration.js |  94 --
 .../outFile/syntax-errors-with-incremental.js |  58 +-
 .../noEmitOnError/outFile/syntax-errors.js    |  70 --
 .../non-module-projects-without-prepend.js    |  48 +-
 ...iles-containing-json-file-non-composite.js |   1 +
 .../files-containing-json-file.js             |   1 +
 .../include-and-files-non-composite.js        |   1 +
 .../resolveJsonModule/include-and-files.js    |   1 +
 ...file-name-matches-ts-file-non-composite.js |   1 +
 ...r-include-and-file-name-matches-ts-file.js |   1 +
 ...-along-with-other-include-non-composite.js |   1 +
 ...nclude-of-json-along-with-other-include.js |   1 +
 .../include-only-non-composite.js             |   1 +
 ...-with-json-not-in-rootDir-non-composite.js |   1 +
 .../include-only-with-json-not-in-rootDir.js  |   1 +
 ...t-outside-configDirectory-non-composite.js |   1 +
 ...out-rootDir-but-outside-configDirectory.js |   1 +
 ...clude-only-without-outDir-non-composite.js |   1 +
 .../include-only-without-outDir.js            |   1 +
 .../tsbuild/resolveJsonModule/include-only.js |   1 +
 .../sourcemap-non-composite.js                |   2 +
 .../tsbuild/resolveJsonModule/sourcemap.js    |   2 +
 .../without-outDir-non-composite.js           |   2 +
 .../resolveJsonModule/without-outDir.js       |   2 +
 ...-referenced-project-and-shared-is-first.js | 228 ++++-
 ...en-root-file-is-from-referenced-project.js | 228 ++++-
 ...hen-module-option-changes-discrepancies.js |   4 +-
 .../sample1/when-module-option-changes.js     |  16 +-
 ...roject-uses-different-module-resolution.js |  36 +-
 .../transitiveReferences/builds-correctly.js  |  40 +-
 ...de-resolution-with-external-module-name.js |  14 +-
 .../reports-syntax-errors-in-config-file.js   | 110 +--
 .../extends/configDir-template.js             |  39 +-
 ...for-changes-to-package-json-main-fields.js |  52 +-
 ...se-different-module-resolution-settings.js |  16 +-
 .../dts-errors-with-incremental-as-modules.js |  80 +-
 ...dts-enabled-with-incremental-as-modules.js |  72 +-
 ...ntic-errors-with-incremental-as-modules.js |  80 +-
 ...ntax-errors-with-incremental-as-modules.js |  32 +-
 ...Error-with-declaration-with-incremental.js | 256 +----
 .../outFile/noEmitOnError-with-declaration.js | 276 ------
 .../outFile/noEmitOnError-with-incremental.js | 194 +---
 .../noEmitOnError/outFile/noEmitOnError.js    | 186 ----
 ...-referenced-project-and-shared-is-first.js | 114 ++-
 ...en-root-file-is-from-referenced-project.js | 114 ++-
 .../tsc/composite/converting-to-modules.js    |  16 +-
 ...-dts-generation-errors-with-incremental.js |  16 +-
 ...ing-Windows-paths-and-uppercase-letters.js |   9 +-
 .../configDir-template-with-commandline.js    |  11 +-
 .../tsc/extends/configDir-template.js         |  11 +-
 .../different-options-with-incremental.js     | 176 +---
 .../incremental/outFile/different-options.js  | 160 +--
 ...to-the-referenced-project-discrepancies.js | 126 +--
 ...file-is-added-to-the-referenced-project.js | 580 +----------
 .../tsc/moduleResolution/pnpm-style-layout.js |   9 +-
 ...s-errors-with-incremental-discrepancies.js | 226 +----
 .../outFile/dts-errors-with-incremental.js    |  98 +-
 ...c-errors-with-incremental-discrepancies.js | 226 +----
 .../semantic-errors-with-incremental.js       |  98 +-
 ...x-errors-with-incremental-discrepancies.js | 226 +----
 .../outFile/syntax-errors-with-incremental.js |  82 +-
 .../tsc/noEmit/outFile/changes-composite.js   |  96 +-
 .../changes-incremental-declaration.js        |  96 +-
 .../tsc/noEmit/outFile/changes-incremental.js |  96 +-
 .../changes-with-initial-noEmit-composite.js  |  80 +-
 ...-initial-noEmit-incremental-declaration.js |  80 +-
 ...changes-with-initial-noEmit-incremental.js |  80 +-
 ...tion-enable-changes-with-multiple-files.js | 120 +--
 ...th-incremental-as-modules-discrepancies.js |   8 +-
 .../dts-errors-with-incremental-as-modules.js |  80 +-
 ...dts-enabled-with-incremental-as-modules.js |  72 +-
 ...ntic-errors-with-incremental-as-modules.js |  80 +-
 ...ntax-errors-with-incremental-as-modules.js |  32 +-
 ...rrors-with-declaration-with-incremental.js | 118 +--
 .../outFile/dts-errors-with-declaration.js    |  86 --
 .../outFile/dts-errors-with-incremental.js    |  82 +-
 .../tsc/noEmitOnError/outFile/dts-errors.js   |  50 -
 ...rrors-with-declaration-with-incremental.js |  78 +-
 .../semantic-errors-with-declaration.js       |  62 --
 .../semantic-errors-with-incremental.js       |  54 +-
 .../noEmitOnError/outFile/semantic-errors.js  |  38 -
 ...rrors-with-declaration-with-incremental.js |  82 +-
 .../outFile/syntax-errors-with-declaration.js |  66 --
 .../outFile/syntax-errors-with-incremental.js |  58 +-
 .../noEmitOnError/outFile/syntax-errors.js    |  42 -
 ...g-when-module-reference-is-not-relative.js |  27 +-
 .../export-with-incremental.js                | 202 ++--
 .../no-circular-import/export.js              |  54 +-
 .../exports-with-incremental.js               | 220 +++--
 .../yes-circular-import/exports.js            |  56 +-
 .../export-with-incremental.js                | 189 +++-
 .../no-circular-import/export.js              |  53 +-
 .../exports-with-incremental.js               | 206 +++-
 .../yes-circular-import/exports.js            |  54 +-
 .../export-with-incremental.js                | 207 ++--
 .../no-circular-import/export.js              |  63 +-
 .../exports-with-incremental.js               | 227 +++--
 .../yes-circular-import/exports.js            |  67 +-
 .../export-with-incremental.js                | 207 ++--
 .../no-circular-import/export.js              |  63 +-
 .../exports-with-incremental.js               | 227 +++--
 .../yes-circular-import/exports.js            |  67 +-
 .../export-with-incremental.js                | 207 ++--
 .../no-circular-import/export.js              |  63 +-
 .../exports-with-incremental.js               | 227 +++--
 .../yes-circular-import/exports.js            |  67 +-
 .../export-with-incremental.js                | 207 ++--
 .../no-circular-import/export.js              |  63 +-
 .../exports-with-incremental.js               | 227 +++--
 .../yes-circular-import/exports.js            |  67 +-
 .../tscWatch/extends/configDir-template.js    |  25 +-
 .../dts-errors-with-incremental-as-modules.js |  80 +-
 ...dts-enabled-with-incremental-as-modules.js |  72 +-
 ...ntic-errors-with-incremental-as-modules.js |  80 +-
 ...ntax-errors-with-incremental-as-modules.js |  32 +-
 ...Error-with-declaration-with-incremental.js | 256 +----
 .../outFile/noEmitOnError-with-declaration.js | 192 ----
 .../outFile/noEmitOnError-with-incremental.js | 194 +---
 .../noEmitOnError/outFile/noEmitOnError.js    | 130 ---
 ...odule-resolution-changes-in-config-file.js |   1 +
 ...solution-when-resolveJsonModule-changes.js |   2 +
 ...n-creating-new-file-in-symlinked-folder.js |  24 +-
 ...file-is-added-to-the-referenced-project.js | 180 +---
 ...-different-folders-with-no-files-clause.js | 176 +++-
 ...nsitive-references-in-different-folders.js | 176 +++-
 .../on-transitive-references-with-nodenext.js | 176 +++-
 .../on-transitive-references.js               | 176 +++-
 ...roject-uses-different-module-resolution.js |  36 +-
 .../with-modules-linked-to-sibling-folder.js  |   9 +-
 ...rogram-with-files-from-external-library.js |   2 +
 .../when-emitting-with-emitOnlyDtsFiles.js    | 170 +---
 ...noEmit-with-composite-with-emit-builder.js |  80 +-
 ...it-with-composite-with-semantic-builder.js |  80 +-
 ...nError-with-composite-with-emit-builder.js |  16 +-
 ...or-with-composite-with-semantic-builder.js |  16 +-
 .../outFile/semantic-builder-emitOnlyDts.js   |  16 +-
 .../when-emitting-with-emitOnlyDtsFiles.js    | 124 +--
 ...ing-useSourceOfProjectReferenceRedirect.js | 180 +---
 ...-host-implementing-getParsedCommandLine.js |  32 +-
 .../with-non-synchronous-watch-directory.js   |   4 +
 ...-file-with-case-insensitive-file-system.js |  16 +-
 ...ig-file-with-case-sensitive-file-system.js |  16 +-
 .../when-calling-goto-definition-of-module.js |  17 +-
 ...n-creating-new-file-in-symlinked-folder.js |  17 +-
 ...-not-count-against-the-resolution-limit.js |   2 +-
 ...ailable-from-module-specifier-cache-(1).js |   2 +-
 ...ailable-from-module-specifier-cache-(2).js |   2 +-
 ...-for-transient-symbols-between-requests.js |   2 +-
 ...orks-with-PackageJsonAutoImportProvider.js |   2 +-
 .../tsserver/completionsIncomplete/works.js   |   2 +-
 ...odule-resolution-changes-in-config-file.js |   2 +-
 .../tsserver/extends/configDir-template.js    |  34 +-
 ...ied-with-a-case-insensitive-file-system.js |  16 +-
 .../autoImportCrossProject_baseUrl_toDist.js  |  16 +-
 ...toImportCrossProject_paths_sharedOutDir.js |  14 +
 .../autoImportCrossProject_paths_stripSrc.js  |  14 +
 .../autoImportCrossProject_paths_toDist.js    |  14 +
 .../autoImportCrossProject_paths_toDist2.js   |   2 +-
 .../autoImportCrossProject_paths_toSrc.js     |  14 +
 ...utoImportCrossProject_symlinks_stripSrc.js |  14 +
 .../autoImportCrossProject_symlinks_toDist.js |  14 +
 .../autoImportCrossProject_symlinks_toSrc.js  |  14 +
 .../fourslashServer/autoImportProvider3.js    |   7 +-
 .../autoImportProvider_exportMap2.js          |   2 +-
 .../importSuggestionsCache_coreNodeModules.js |  58 --
 .../using-referenced-project-built.js         |  57 +-
 .../using-referenced-project.js               |  17 +-
 ...-as-project-build-with-external-project.js |  32 +-
 ...indirect-project-but-not-in-another-one.js |  51 +-
 ...ject-is-directly-referenced-by-solution.js | 119 ++-
 ...ct-is-indirectly-referenced-by-solution.js | 187 +++-
 ...om-composite-and-non-composite-projects.js |  34 +-
 ...nced-project-and-using-declaration-maps.js |  74 +-
 ...ot-file-is-file-from-referenced-project.js |  74 +-
 ...indirect-project-but-not-in-another-one.js | 102 +-
 ...dProjectLoad-is-set-in-indirect-project.js |  51 +-
 ...-if-disableReferencedProjectLoad-is-set.js |  51 +-
 ...ces-open-file-through-project-reference.js | 218 ++++-
 ...ct-is-indirectly-referenced-by-solution.js | 286 +++++-
 ...-referenced-project-and-shared-is-first.js |  17 +-
 ...en-root-file-is-from-referenced-project.js |  17 +-
 ...es-with-deleting-referenced-config-file.js |  48 +-
 ...ing-transitively-referenced-config-file.js |  48 +-
 ...ces-with-edit-in-referenced-config-file.js |  17 +-
 ...ive-references-with-edit-on-config-file.js |  51 +-
 ...ansitive-references-with-non-local-edit.js |  17 +-
 ...es-with-deleting-referenced-config-file.js |  48 +-
 ...ing-transitively-referenced-config-file.js |  48 +-
 ...les-with-edit-in-referenced-config-file.js |  17 +-
 ...-without-files-with-edit-on-config-file.js |  51 +-
 ...ences-without-files-with-non-local-edit.js |  17 +-
 .../resolutionCache/when-resolution-fails.js  |  21 -
 .../when-resolves-to-ambient-module.js        |  21 -
 ...ping-when-project-compiles-from-sources.js |  34 +-
 ...s-in-typings-folder-and-then-recompiles.js |  17 +-
 ...mpiles-after-deleting-generated-folders.js |  17 +-
 ...ences-resolution-after-program-creation.js |  14 +
 .../telemetry/does-not-expose-paths.js        |  14 +
 .../reference/tsxAttributeResolution10.js     |  48 +-
 .../reference/tsxAttributeResolution9.js      |  40 +-
 .../tsxElementResolution17.errors.txt         |   2 +-
 .../reference/tsxElementResolution19.js       | 113 +--
 .../reference/tsxPreserveEmit1.errors.txt     |   6 +-
 .../reference/tsxPreserveEmit3.errors.txt     |   2 +-
 .../tsxSfcReturnUndefinedStrictNullChecks.js  |  32 +-
 .../tsxStatelessFunctionComponentOverload4.js |  88 +-
 .../tsxStatelessFunctionComponentOverload5.js | 102 +-
 .../tsxStatelessFunctionComponentOverload6.js | 110 +--
 ...essFunctionComponentsWithTypeArguments4.js |  26 +-
 .../reference/typeResolution.errors.txt       |  16 +-
 .../typesVersions.emptyTypes.errors.txt       |  20 +
 .../typesVersions.justIndex.errors.txt        |  19 +
 .../reference/undeclaredModuleError.js        |  48 +-
 .../reference/withExportDecl.errors.txt       |   6 +-
 .../reference/withImportDecl.errors.txt       |   2 +-
 522 files changed, 8052 insertions(+), 15600 deletions(-)
 create mode 100644 tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportWithoutFromClause.errors.txt
 delete mode 100644 tests/baselines/reference/es6ImportWithoutFromClauseNonInstantiatedModule.errors.txt
 create mode 100644 tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution3_node.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution4_node.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution5_node.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution7_node.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution8_node.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtensionInName.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt
 create mode 100644 tests/baselines/reference/pathMappingInheritedBaseUrl.errors.txt
 create mode 100644 tests/baselines/reference/requireOfJsonFile_PathMapping.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).errors.txt
 create mode 100644 tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).oldTranspile.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Supports setting baseUrl.errors.txt
 create mode 100644 tests/baselines/reference/transpile/Supports setting baseUrl.oldTranspile.errors.txt
 create mode 100644 tests/baselines/reference/typesVersions.emptyTypes.errors.txt
 create mode 100644 tests/baselines/reference/typesVersions.justIndex.errors.txt

diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 456413cb19bd5..9f98f88164095 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -4717,6 +4717,10 @@
         "category": "Error",
         "code": 5110
     },
+    "Visit https://aka.ms/ts6 for migration information.": {
+        "category": "Message",
+        "code": 5111
+    },
 
     "Generates a sourcemap for each corresponding '.d.ts' file.": {
         "category": "Message",
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index a49c300641a50..652d92257377c 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -4446,8 +4446,8 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
     function checkDeprecations(
         deprecatedIn: string,
         removedIn: string,
-        createDiagnostic: (name: string, value: string | undefined, useInstead: string | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) => void,
-        fn: (createDeprecatedDiagnostic: (name: string, value?: string, useInstead?: string) => void) => void,
+        createDiagnostic: (name: string, value: string | undefined, useInstead: string | undefined, related: DiagnosticMessage | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) => void,
+        fn: (createDeprecatedDiagnostic: (name: string, value?: string, useInstead?: string, related?: DiagnosticMessage) => void) => void,
     ) {
         const deprecatedInVersion = new Version(deprecatedIn);
         const removedInVersion = new Version(removedIn);
@@ -4458,21 +4458,21 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
         const canBeSilenced = !mustBeRemoved && ignoreDeprecationsVersion.compareTo(deprecatedInVersion) === Comparison.LessThan;
 
         if (mustBeRemoved || canBeSilenced) {
-            fn((name, value, useInstead) => {
+            fn((name, value, useInstead, related) => {
                 if (mustBeRemoved) {
                     if (value === undefined) {
-                        createDiagnostic(name, value, useInstead, Diagnostics.Option_0_has_been_removed_Please_remove_it_from_your_configuration, name);
+                        createDiagnostic(name, value, useInstead, related, Diagnostics.Option_0_has_been_removed_Please_remove_it_from_your_configuration, name);
                     }
                     else {
-                        createDiagnostic(name, value, useInstead, Diagnostics.Option_0_1_has_been_removed_Please_remove_it_from_your_configuration, name, value);
+                        createDiagnostic(name, value, useInstead, related, Diagnostics.Option_0_1_has_been_removed_Please_remove_it_from_your_configuration, name, value);
                     }
                 }
                 else {
                     if (value === undefined) {
-                        createDiagnostic(name, value, useInstead, Diagnostics.Option_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error, name, removedIn, deprecatedIn);
+                        createDiagnostic(name, value, useInstead, related, Diagnostics.Option_0_is_deprecated_and_will_stop_functioning_in_TypeScript_1_Specify_compilerOption_ignoreDeprecations_Colon_2_to_silence_this_error, name, removedIn, deprecatedIn);
                     }
                     else {
-                        createDiagnostic(name, value, useInstead, Diagnostics.Option_0_1_is_deprecated_and_will_stop_functioning_in_TypeScript_2_Specify_compilerOption_ignoreDeprecations_Colon_3_to_silence_this_error, name, value, removedIn, deprecatedIn);
+                        createDiagnostic(name, value, useInstead, related, Diagnostics.Option_0_1_is_deprecated_and_will_stop_functioning_in_TypeScript_2_Specify_compilerOption_ignoreDeprecations_Colon_3_to_silence_this_error, name, value, removedIn, deprecatedIn);
                     }
                 }
             });
@@ -4480,14 +4480,22 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
     }
 
     function verifyDeprecatedCompilerOptions() {
-        function createDiagnostic(name: string, value: string | undefined, useInstead: string | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) {
+        function createDiagnostic(name: string, value: string | undefined, useInstead: string | undefined, related: DiagnosticMessage | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) {
             if (useInstead) {
-                const details = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Use_0_instead, useInstead);
+                let details = chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Use_0_instead, useInstead);
+                if (related) {
+                    details = chainDiagnosticMessages(details, related);
+                }
                 const chain = chainDiagnosticMessages(details, message, ...args);
                 createDiagnosticForOption(/*onKey*/ !value, name, /*option2*/ undefined, chain);
             }
             else {
-                createDiagnosticForOption(/*onKey*/ !value, name, /*option2*/ undefined, message, ...args);
+                let details: DiagnosticMessageChain | undefined;
+                if (related) {
+                    details = chainDiagnosticMessages(/*details*/ undefined, related);
+                }
+                const chain = chainDiagnosticMessages(details, message, ...args);
+                createDiagnosticForOption(/*onKey*/ !value, name, /*option2*/ undefined, chain);
             }
         }
 
@@ -4526,7 +4534,10 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
 
         checkDeprecations("6.0", "7.0", createDiagnostic, createDeprecatedDiagnostic => {
             if (options.moduleResolution === ModuleResolutionKind.Node10) {
-                createDeprecatedDiagnostic("moduleResolution", "node10");
+                createDeprecatedDiagnostic("moduleResolution", "node10", /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
+            }
+            if (options.baseUrl !== undefined) {
+                createDeprecatedDiagnostic("baseUrl", /*value*/ undefined, /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
             }
             if (options.moduleResolution === ModuleResolutionKind.Classic) {
                 createDeprecatedDiagnostic("moduleResolution", "classic");
@@ -4538,7 +4549,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
     }
 
     function verifyDeprecatedProjectReference(ref: ProjectReference, parentFile: JsonSourceFile | undefined, index: number) {
-        function createDiagnostic(_name: string, _value: string | undefined, _useInstead: string | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) {
+        function createDiagnostic(_name: string, _value: string | undefined, _useInstead: string | undefined, _related: DiagnosticMessage | undefined, message: DiagnosticMessage, ...args: DiagnosticArguments) {
             createDiagnosticForReference(parentFile, index, message, ...args);
         }
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 0985426e4202f..21c50bd9a4536 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -7419,6 +7419,7 @@ export interface CompilerOptions {
     allowUnreachableCode?: boolean;
     allowUnusedLabels?: boolean;
     alwaysStrict?: boolean; // Always combine with strict property
+    /** @deprecated */
     baseUrl?: string;
     /**
      * An error if set - this should only go through the -b pipeline and not actually be observed
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
index 3bafc52f87086..31c369297e8e5 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
@@ -1,20 +1,8 @@
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,8): error TS1192: Module '"b"' has no default export.
 
 
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-!!! 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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== a.ts (1 errors) ====
     import Namespace from "./b";
            ~~~~~~~~~
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
index c506ef7dea8bf..ba6e3ae08b21b 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
@@ -1,20 +1,8 @@
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,8): error TS1259: Module '"b"' can only be default-imported using the 'esModuleInterop' flag
 
 
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-!!! 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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== b.d.ts (0 errors) ====
     declare class Foo {
     	member: string;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
index 8f8fa2cabe2ae..a2e5847ee71e1 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
@@ -1,20 +1,8 @@
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 a.ts(1,10): error TS2305: Module '"./b"' has no exported member 'default'.
 
 
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-!!! 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 '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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 ==== b.d.ts (0 errors) ====
     export function foo();
     
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
index b25dc67f398c6..e88bb7bec8ed1 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.js
@@ -13,29 +13,9 @@ import ext = require("ext");
 var x = ext;
 
 //// [ambientExternalModuleInAnotherExternalModule.js]
-<<<<<<< HEAD
-define(["require", "exports", "ext"], function (require, exports, ext) {
-    "use strict";
-    class D {
-    }
-    var x = ext;
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports", "ext"], function (require, exports, ext) {
-    "use strict";
-    var D = /** @class */ (function () {
-        function D() {
-        }
-        return D;
-    }());
-    var x = ext;
-=======
 "use strict";
-var D = /** @class */ (function () {
-    function D() {
-    }
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    return D;
-}());
+class D {
+}
 // Cannot resolve this ext module reference
 var ext = require("ext");
 var x = ext;
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
index d7fe786ac226a..ea38d5207b53d 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.errors.txt
@@ -8,7 +8,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var c = new A();
 ==== ambientExternalModuleWithInternalImportDeclaration_0.ts (0 errors) ====
     declare module 'M' {
-        namespace C {
+        module C {
             export var f: number;
         }
         class C {
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
index 7007f99196d25..14100c9246a17 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.errors.txt
@@ -8,7 +8,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var c = new A();
 ==== ambientExternalModuleWithoutInternalImportDeclaration_0.ts (0 errors) ====
     declare module 'M' {
-        namespace C {
+        module C {
             export var f: number;
         }
         class C {
diff --git a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
index 894871da4ea76..c55a16e6569a8 100644
--- a/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
+++ b/tests/baselines/reference/ambientInsideNonAmbientExternalModule.errors.txt
@@ -7,4 +7,4 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     export declare function f();
     export declare class C { }
     export declare enum E { }
-    export declare namespace M { }
\ No newline at end of file
+    export declare module M { }
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName4.errors.txt b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
index 877e522bbb2a8..a3fb2a2914cb9 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.errors.txt
+++ b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
@@ -1,24 +1,12 @@
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-amdDependencyCommentName4.ts(6,8): error TS2882: Cannot find module or type declarations for side-effect import of 'unaliasedModule1'.
-=======
 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'.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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?
 amdDependencyCommentName4.ts(14,15): error TS2792: Cannot find module 'aliasedModule3'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 amdDependencyCommentName4.ts(17,21): error TS2792: Cannot find module 'aliasedModule4'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
 
 
-<<<<<<< HEAD
-==== amdDependencyCommentName4.ts (4 errors) ====
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-==== amdDependencyCommentName4.ts (6 errors) ====
-=======
 !!! 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) ====
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== amdDependencyCommentName4.ts (4 errors) ====
     ///<amd-dependency path='aliasedModule5' name='n1'/>
     ///<amd-dependency path='unaliasedModule3'/>
     ///<amd-dependency path='aliasedModule6' name='n2'/>
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt b/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
index 2384ff62cf093..d7ad507edc7fa 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.errors.txt
@@ -22,7 +22,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     	age: number;
     }
     
-    export namespace M1 {
+    export module M1 {
     	export interface I2 {
     		foo: string;
     	}
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index df94f6114d48d..b2409a83a83f0 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -7024,6 +7024,7 @@ declare namespace ts {
         allowUnreachableCode?: boolean;
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
+        /** @deprecated */
         baseUrl?: string;
         /** @deprecated */
         charset?: string;
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index de98bcca2ac68..f5d241153b75e 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -26,21 +26,7 @@ module.exports = x;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [file3.js]
-<<<<<<< HEAD
-define(["require", "exports", "./file2"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let a; // should not work
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports", "./file2"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var a; // should not work
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./file2");
-var a; // should not work
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let a; // should not work
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index 2243badb43c63..30c796d8365ae 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -25,21 +25,7 @@ module.exports = foo;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [file3.js]
-<<<<<<< HEAD
-define(["require", "exports", "./file2"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let a; // should not work
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports", "./file2"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var a; // should not work
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./file2");
-var a; // should not work
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let a; // should not work
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index a917a40c6cbde..7d66ec2a9bd1b 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -36,92 +36,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var x = require("./file1");
 x.b = 1;
 //// [file3.js]
-<<<<<<< HEAD
-define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let a;
-    let b = x.b;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (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;
-});
-=======
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; 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"));
+var x = require("./file1");
 require("./file2");
-var a;
-var b = x.b;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let a;
+let b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index d024f8459bb26..831854d0c8c77 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -24,33 +24,9 @@ let a: x.A;
 let b = x.b;
 
 //// [file1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class foo {
-    }
-    (function (foo) {
-        foo.v = 1;
-    })(foo || (foo = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var foo = /** @class */ (function () {
-        function foo() {
-        }
-        return foo;
-    }());
-    (function (foo) {
-        foo.v = 1;
-    })(foo || (foo = {}));
-=======
 "use strict";
-var foo = /** @class */ (function () {
-    function foo() {
-    }
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    return foo;
-}());
+class foo {
+}
 (function (foo) {
     foo.v = 1;
 })(foo || (foo = {}));
@@ -61,92 +37,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var x = require("./file1");
 x.b = 1;
 //// [file3.js]
-<<<<<<< HEAD
-define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let a;
-    let b = x.b;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (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;
-});
-=======
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; 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"));
+var x = require("./file1");
 require("./file2");
-var a;
-var b = x.b;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let a;
+let b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index 48e5ca5714e90..c316fdb89181a 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -84,24 +84,8 @@ const y = x.id;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [consumer.js]
-<<<<<<< HEAD
-define(["require", "exports", "./augmentation"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let x;
-    const y = x.id;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports", "./augmentation"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    var x;
-    var y = x.id;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 require("./augmentation");
-var x;
-var y = x.id;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let x;
+const y = x.id;
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index bc4039ca3b15e..b37eed4206cc7 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -28,54 +28,14 @@ let b = a.a;
 let c = x.B.b;
 
 //// [file1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class foo {
-    }
-    (function (foo) {
-        class A {
-        }
-        foo.A = A;
-        let B;
-        (function (B) {
-        })(B = foo.B || (foo.B = {}));
-    })(foo || (foo = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var foo = /** @class */ (function () {
-        function foo() {
-        }
-        return 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 = {}));
-=======
 "use strict";
-var foo = /** @class */ (function () {
-    function foo() {
-    }
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    return foo;
-}());
+class foo {
+}
 (function (foo) {
-    var A = /** @class */ (function () {
-        function A() {
-        }
-        return A;
-    }());
+    class A {
+    }
     foo.A = A;
-    var B;
+    let B;
     (function (B) {
     })(B = foo.B || (foo.B = {}));
 })(foo || (foo = {}));
@@ -86,95 +46,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var x = require("./file1");
 x.B.b = 1;
 //// [file3.js]
-<<<<<<< HEAD
-define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let a;
-    let b = a.a;
-    let c = x.B.b;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (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 = a.a;
-    var c = x.B.b;
-});
-=======
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; 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"));
+var x = require("./file1");
 require("./file2");
-var a;
-var b = a.a;
-var c = x.B.b;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+let a;
+let b = a.a;
+let c = x.B.b;
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt b/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
index ebcf0f2eb2e4a..bd9c3109c2cda 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.errors.txt
@@ -5,4 +5,4 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 ==== augmentedTypesExternalModule1.ts (0 errors) ====
     export var a = 1;
     class c5 { public foo() { } }
-    namespace c5 { } // should be ok everywhere
\ No newline at end of file
+    module c5 { } // should be ok everywhere
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
index 4521dc1b535af..b07e062f6e664 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.errors.txt
@@ -1,14 +1,6 @@
-<<<<<<< HEAD
+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,15): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module.
 collisionExportsRequireAndModule_externalmodule.ts(10,15): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module.
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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(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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 !!! 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/collisionExportsRequireAndUninstantiatedModule.errors.txt b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
index b74aa3662bb84..684fe13c754fd 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.errors.txt
@@ -3,14 +3,14 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module require { // no error 
         export interface I {
         }
     }
     export function foo(): require.I {
         return null;
     }
-    export namespace exports { // no error
+    export module exports { // no error
         export interface I {
         }
     }
diff --git a/tests/baselines/reference/commentsDottedModuleName.errors.txt b/tests/baselines/reference/commentsDottedModuleName.errors.txt
index 4893cf17c42f3..21ffc161518f7 100644
--- a/tests/baselines/reference/commentsDottedModuleName.errors.txt
+++ b/tests/baselines/reference/commentsDottedModuleName.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    export module outerModule.InnerModule {
         /// class b comment
         export class b {
         }
diff --git a/tests/baselines/reference/commentsExternalModules.errors.txt b/tests/baselines/reference/commentsExternalModules.errors.txt
index 1e2d583d84131..454645c19632b 100644
--- a/tests/baselines/reference/commentsExternalModules.errors.txt
+++ b/tests/baselines/reference/commentsExternalModules.errors.txt
@@ -12,7 +12,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     
 ==== commentsExternalModules_0.ts (0 errors) ====
     /** Module comment*/
-    export namespace m1 {
+    export module m1 {
         /** b's comment*/
         export var b: number;
         /** foo's comment*/
@@ -20,7 +20,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
             return b;
         }
         /** m2 comments*/
-        export namespace m2 {
+        export module m2 {
             /** class comment;*/
             export class c {
             };
@@ -36,7 +36,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var myvar = new m1.m2.c();
     
     /** Module comment */
-    export namespace m4 {
+    export module m4 {
         /** b's comment */
         export var b: number;
         /** foo's comment
@@ -46,7 +46,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         }
         /** m2 comments
         */
-        export namespace m2 {
+        export module m2 {
             /** class comment; */
             export class c {
             };
diff --git a/tests/baselines/reference/commentsExternalModules2.errors.txt b/tests/baselines/reference/commentsExternalModules2.errors.txt
index 859f2c1134ec3..f8e18084a739e 100644
--- a/tests/baselines/reference/commentsExternalModules2.errors.txt
+++ b/tests/baselines/reference/commentsExternalModules2.errors.txt
@@ -12,7 +12,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     
 ==== commentsExternalModules2_0.ts (0 errors) ====
     /** Module comment*/
-    export namespace m1 {
+    export module m1 {
         /** b's comment*/
         export var b: number;
         /** foo's comment*/
@@ -20,7 +20,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
             return b;
         }
         /** m2 comments*/
-        export namespace m2 {
+        export module m2 {
             /** class comment;*/
             export class c {
             };
@@ -36,7 +36,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var myvar = new m1.m2.c();
     
     /** Module comment */
-    export namespace m4 {
+    export module m4 {
         /** b's comment */
         export var b: number;
         /** foo's comment
@@ -46,7 +46,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         }
         /** m2 comments
         */
-        export namespace m2 {
+        export module m2 {
             /** class comment; */
             export class c {
             };
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
index 7bba5d1ad20e3..50acc06d18213 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 ==== commentsMultiModuleMultiFile_1.ts (0 errors) ====
     import m = require('commentsMultiModuleMultiFile_0');
     /** this is multi module 3 comment*/
-    export namespace multiM {
+    export module multiM {
         /** class d comment*/
         export class d {
         }
@@ -17,13 +17,13 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     new multiM.d();
 ==== commentsMultiModuleMultiFile_0.ts (0 errors) ====
     /** this is multi declare module*/
-    export namespace multiM {
+    export module multiM {
         /// class b comment
         export class b {
         }
     }
     /** thi is multi module 2*/
-    export namespace multiM {
+    export module multiM {
         /** class c comment*/
         export class c {
         }
diff --git a/tests/baselines/reference/constEnumMergingWithValues1.errors.txt b/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
index 89a9781a77439..190199ab0bf0f 100644
--- a/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
+++ b/tests/baselines/reference/constEnumMergingWithValues1.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module foo {
         const enum E { X }
     }
     
diff --git a/tests/baselines/reference/constEnumMergingWithValues2.errors.txt b/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
index 41c37c230e61a..68167700f7c68 100644
--- a/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
+++ b/tests/baselines/reference/constEnumMergingWithValues2.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module foo {
         const enum E { X }
     }
     
diff --git a/tests/baselines/reference/constEnumMergingWithValues3.errors.txt b/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
index 392e81fe5db77..4836c2fbd3da7 100644
--- a/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
+++ b/tests/baselines/reference/constEnumMergingWithValues3.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module foo {
         const enum E { X }
     }
     
diff --git a/tests/baselines/reference/constEnumMergingWithValues4.errors.txt b/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
index e46dea07f4330..312295d42b150 100644
--- a/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
+++ b/tests/baselines/reference/constEnumMergingWithValues4.errors.txt
@@ -3,11 +3,11 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    module foo {
         const enum E { X }
     }
     
-    namespace foo {
+    module foo {
         var x = 1;
     }
     
diff --git a/tests/baselines/reference/constEnumMergingWithValues5.errors.txt b/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
index 2fa0a85fe0dbd..77677b7f410b8 100644
--- a/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
+++ b/tests/baselines/reference/constEnumMergingWithValues5.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    module foo {
         const enum E { X }
     }
     
diff --git a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
index 411849dd0244f..b5ba1ced81b44 100644
--- a/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
+++ b/tests/baselines/reference/contextuallyTypedStringLiteralsInJsxAttributes02.js
@@ -40,33 +40,6 @@ const d1 = <NoOverload1 {...{goTo:"home"}} extra  />;  // goTo has type "home" |
 
 
 //// [file.jsx]
-<<<<<<< HEAD
-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) {
-        const linkProps = props;
-        if (linkProps.goTo) {
-            return this._buildMainLink(props);
-        }
-        return this._buildMainButton(props);
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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);
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
@@ -74,40 +47,17 @@ exports.NoOverload = NoOverload;
 exports.NoOverload1 = NoOverload1;
 var React = require("react");
 function MainButton(props) {
-    var linkProps = props;
+    const linkProps = props;
     if (linkProps.goTo) {
         return this._buildMainLink(props);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
-<<<<<<< HEAD
-    const b0 = <MainButton {...{ onClick: (k) => { console.log(k); } }} extra/>; // k has type "left" | "right"
-    const b2 = <MainButton onClick={(k) => { console.log(k); }} extra/>; // k has type "left" | "right"
-    const b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
-    const b4 = <MainButton goTo="home" extra/>; // goTo has type "home" | "contact"
-    function NoOverload(buttonProps) { return undefined; }
-    const c1 = <NoOverload {...{ onClick: (k) => { console.log(k); } }} extra/>; // k has type any
-    function NoOverload1(linkProps) { return undefined; }
-    const d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    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"
-});
-=======
     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"
+const b0 = <MainButton {...{ onClick: (k) => { console.log(k); } }} extra/>; // k has type "left" | "right"
+const b2 = <MainButton onClick={(k) => { console.log(k); }} extra/>; // k has type "left" | "right"
+const b3 = <MainButton {...{ goTo: "home" }} extra/>; // goTo has type"home" | "contact"
+const 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
+const c1 = <NoOverload {...{ onClick: (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"
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+const d1 = <NoOverload1 {...{ goTo: "home" }} extra/>; // goTo has type "home" | "contact"
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index edaf467e6940d..00578e70fae10 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,39 +15,11 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 
 
 //// [crashIntypeCheckInvocationExpression.js]
-<<<<<<< HEAD
-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(() => {
-        var folder = path.join(), fileset = nake.fileSetSync(folder);
-        return doCompile(fileset, moduleType);
-    });
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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);
-    });
-=======
 var nake;
 function doCompile(fileset, moduleType) {
     return undefined;
 }
-export var compileServer = task(function () {
+export var compileServer = task(() => {
     var folder = path.join(), fileset = nake.fileSetSync(folder);
     return doCompile(fileset, moduleType);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 });
diff --git a/tests/baselines/reference/declFileExportImportChain.errors.txt b/tests/baselines/reference/declFileExportImportChain.errors.txt
index ada1a14a394ee..f7d64139169f7 100644
--- a/tests/baselines/reference/declFileExportImportChain.errors.txt
+++ b/tests/baselines/reference/declFileExportImportChain.errors.txt
@@ -6,8 +6,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     import c = require("declFileExportImportChain_c");
     export var x: c.b1.a.m2.c1;
 ==== declFileExportImportChain_a.ts (0 errors) ====
-    namespace m1 {
-        export namespace m2 {
+    module m1 {
+        export module m2 {
             export class c1 {
             }
         }
diff --git a/tests/baselines/reference/declFileExportImportChain2.errors.txt b/tests/baselines/reference/declFileExportImportChain2.errors.txt
index f9049968335b9..dd6b15968e9ff 100644
--- a/tests/baselines/reference/declFileExportImportChain2.errors.txt
+++ b/tests/baselines/reference/declFileExportImportChain2.errors.txt
@@ -6,8 +6,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     import c = require("declFileExportImportChain2_c");
     export var x: c.b.m2.c1;
 ==== declFileExportImportChain2_a.ts (0 errors) ====
-    namespace m1 {
-        export namespace m2 {
+    module m1 {
+        export module m2 {
             export class c1 {
             }
         }
diff --git a/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
new file mode 100644
index 0000000000000..e8805648d8e91
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitMonorepoBaseUrl.errors.txt
@@ -0,0 +1,59 @@
+/tsconfig.json(6,5): 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.
+
+
+==== /tsconfig.json (1 errors) ====
+    {
+      "compilerOptions": {
+        "module": "nodenext",
+        "declaration": true,
+        "outDir": "temp",
+        "baseUrl": "."
+        ~~~~~~~~~
+!!! 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.
+      }
+    }
+    
+==== /packages/compiler-core/src/index.ts (0 errors) ====
+    import { PluginConfig } from "@babel/parser";
+    
+==== /packages/compiler-sfc/src/index.ts (0 errors) ====
+    import { createPlugin } from "@babel/parser";
+    export function resolveParserPlugins() {
+      return [createPlugin()];
+    }
+    
+==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/package.json (0 errors) ====
+    {
+      "name": "@babel/parser",
+      "version": "7.23.6",
+      "main": "./lib/index.js",
+      "types": "./typings/babel-parser.d.ts"
+    }
+    
+==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/typings/babel-parser.d.ts (0 errors) ====
+    export declare function createPlugin(): PluginConfig;
+    export declare class PluginConfig {}
+    
+==== /packages/compiler-core/package.json (0 errors) ====
+    {
+      "name": "@vue/compiler-core",
+      "version": "3.0.0",
+      "main": "./src/index.ts",
+      "dependencies": {
+        "@babel/parser": "^7.0.0"
+      }
+    }
+    
+==== /packages/compiler-sfc/package.json (0 errors) ====
+    {
+      "name": "@vue/compiler-sfc",
+      "version": "3.0.0",
+      "main": "./src/index.ts",
+      "dependencies": {
+        "@babel/parser": "^7.0.0",
+        "@vue/compiler-core": "^3.0.0"
+      }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
new file mode 100644
index 0000000000000..653d7e7aca506
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo.errors.txt
@@ -0,0 +1,34 @@
+packages/b/tsconfig.json(5,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.
+
+
+==== packages/b/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "outDir": "dist",
+            "declaration": true,
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "@ts-bug/a": ["../a"]
+            }
+        }
+    }
+    
+    
+==== packages/b/src/index.ts (0 errors) ====
+    import { a } from "@ts-bug/a";
+    
+    export function b(text: string) {
+      return a(text);
+    }
+==== packages/a/index.d.ts (0 errors) ====
+    declare module "@ts-bug/a" {
+        export type AText = {
+          value: string;
+        };
+        export function a(text: string): AText;
+      }
+      
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
new file mode 100644
index 0000000000000..e9a010c421b52
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitPathMappingMonorepo2.errors.txt
@@ -0,0 +1,51 @@
+packages/lab/tsconfig.json(5,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.
+
+
+==== packages/lab/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "outDir": "dist",
+            "declaration": true,
+            "baseUrl": "../",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "@ts-bug/core": ["./core/src"],
+                "@ts-bug/core/*": ["./core/src/*"],
+                "@ts-bug/lab": ["./lab/src"],
+                "@ts-bug/lab/*": ["./lab/src/*"],
+                "@ts-bug/styles": ["./styles/src"],
+                "@ts-bug/styles/*": ["./styles/src/*"]
+            }
+        }
+    }
+==== packages/lab/src/index.ts (0 errors) ====
+    import { createSvgIcon } from "@ts-bug/core/utils";
+    export default createSvgIcon("Hello", "ArrowLeft");
+    
+==== packages/core/src/index.d.ts (0 errors) ====
+    export * from "./utils";
+    export { default as SvgIcon } from "./SvgIcon";
+    
+==== packages/core/src/SvgIcon.d.ts (0 errors) ====
+    import { StyledComponentProps } from "@ts-bug/styles";
+    export interface SvgIconProps extends StyledComponentProps<"root"> {
+        children?: string[];
+    }
+    export interface SomeInterface {
+        myProp: string;
+    }
+    declare const SvgIcon: SomeInterface;
+    export default SvgIcon;
+    
+==== packages/core/src/utils.d.ts (0 errors) ====
+    import SvgIcon from "./SvgIcon";
+    export function createSvgIcon(path: string, displayName: string): typeof SvgIcon;
+    
+==== packages/styles/src/index.d.ts (0 errors) ====
+    export interface StyledComponentProps<ClassKey extends string> {
+        classes?: Record<ClassKey, string>;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.errors.txt b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.errors.txt
new file mode 100644
index 0000000000000..b973b452e13b5
--- /dev/null
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.errors.txt
@@ -0,0 +1,24 @@
+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 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.
+==== src/lib/operators/scalar.ts (0 errors) ====
+    export interface Scalar {
+    	(): string;
+    	value: number;
+    }
+    
+    export function scalar(value: string): Scalar {
+    	return null as any;
+    }
+==== src/settings/spacing.ts (0 errors) ====
+    import { scalar } from '../lib/operators/scalar';
+    
+    export default {
+    	get xs() {
+    		return scalar("14px");
+    	}
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
index cf4b630ac09d7..9a755bff3fbe1 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling.types
@@ -16,6 +16,7 @@ export function scalar(value: string): Scalar {
 
 	return null as any;
 >null as any : any
+>            : ^^^
 }
 === src/settings/spacing.ts ===
 import { scalar } from '../lib/operators/scalar';
diff --git a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
index 559a5f7c64d19..317bce8a19b24 100644
--- a/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
+++ b/tests/baselines/reference/declarationEmitPrefersPathKindBasedOnBundling2.types
@@ -16,6 +16,7 @@ export function scalar(value: string): Scalar {
 
 	return null as any;
 >null as any : any
+>            : ^^^
 }
 === src/settings/spacing.ts ===
 import { scalar } from '../lib/operators/scalar';
diff --git a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
index b77245686dbd9..91aa12f7cc7cd 100644
--- a/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
+++ b/tests/baselines/reference/duplicateIdentifierShouldNotShortCircuitBaseTypeBinding.errors.txt
@@ -3,20 +3,4 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index c8fa040349c5d..e2a538eaacafc 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,47 +38,20 @@ export var tests: TestRunner = (function () {
 })();
 
 //// [duplicateLocalVariable2.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.tests = exports.TestRunner = exports.TestCase = void 0;
-    class TestCase {
-        constructor(name, test, errorMessageRegEx) {
-            this.name = name;
-            this.test = test;
-            this.errorMessageRegEx = errorMessageRegEx;
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-=======
-var TestCase = /** @class */ (function () {
-    function TestCase(name, test, errorMessageRegEx) {
+export class TestCase {
+    constructor(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) {
+}
+export class TestRunner {
+    static arrayCompare(arg1, arg2) {
         return false;
-    };
-    TestRunner.prototype.addTest = function (test) {
-    };
-    return TestRunner;
-}());
-export { TestRunner };
+    }
+    addTest(test) {
+    }
+}
 export var tests = (function () {
     var testRunner = new TestRunner();
     testRunner.addTest(new TestCase("Check UTF8 encoding", function () {
@@ -87,75 +60,7 @@ export var tests = (function () {
         var chars = [0x0054];
         for (var i in chars) {
             fb.writeUtf8CodePoint(chars[i]);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        }
-<<<<<<< HEAD
-    }
-    exports.TestCase = TestCase;
-    class TestRunner {
-        static arrayCompare(arg1, arg2) {
-            return false;
-        }
-        addTest(test) {
-        }
-    }
-    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;
-    })();
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        return TestCase;
-    }());
-    exports.TestCase = TestCase;
-    var TestRunner = /** @class */ (function () {
-        function 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;
-    })();
-});
-=======
         fb.index = 0;
         var bytes = [];
         for (var i = 0; i < 14; i++) {
@@ -166,4 +71,3 @@ export var tests = (function () {
     }));
     return testRunner;
 })();
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
index d08a3313c2047..684a206f24f71 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
@@ -1,25 +1,43 @@
-duplicateSymbolsExportMatching.ts(24,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(25,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(26,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(27,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(32,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(35,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(42,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(43,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(49,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
-duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(58,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(64,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
-duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(1,1): error TS1185: Merge conflict marker encountered.
+duplicateSymbolsExportMatching.ts(3,1): error TS1185: Merge conflict marker encountered.
+duplicateSymbolsExportMatching.ts(5,1): error TS1185: Merge conflict marker encountered.
+duplicateSymbolsExportMatching.ts(7,1): error TS1185: Merge conflict marker encountered.
+duplicateSymbolsExportMatching.ts(30,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(31,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(32,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(33,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(38,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(41,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(48,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(49,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(50,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(51,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(55,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(55,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
+duplicateSymbolsExportMatching.ts(58,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(62,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(63,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(64,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(70,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
+duplicateSymbolsExportMatching.ts(71,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
 
 
-==== duplicateSymbolsExportMatching.ts (18 errors) ====
+==== duplicateSymbolsExportMatching.ts (22 errors) ====
+    <<<<<<< HEAD
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
     module M {
+    ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    namespace M {
+    =======
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    namespace M {
+    >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
         export interface E { }
         interface I { }
     }
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index b601c1013b641..63924c722e9ee 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -1,7 +1,13 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 //// [duplicateSymbolsExportMatching.ts]
+<<<<<<< HEAD
 module M {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+namespace M {
+=======
+namespace M {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
     interface I { }
 }
@@ -68,90 +74,12 @@ interface D { }
 export interface D { }
 
 //// [duplicateSymbolsExportMatching.js]
-<<<<<<< HEAD
-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) {
-        let 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) {
-        let 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) {
-        class C {
-        }
-        (function (C) {
-            var t;
-        })(C = M.C || (M.C = {}));
-    })(M || (M = {}));
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 = {}));
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // Should report error only once for instantiated module
 var M;
 (function (M) {
-    var inst;
+    let inst;
     (function (inst) {
         var t;
     })(inst || (inst = {}));
@@ -166,7 +94,7 @@ var M2;
     var w;
 })(M2 || (M2 = {}));
 (function (M) {
-    var F;
+    let F;
     (function (F) {
         var t;
     })(F || (F = {}));
@@ -174,13 +102,9 @@ var M2;
     M.F = F;
 })(M || (M = {}));
 (function (M) {
-    var C = /** @class */ (function () {
-        function C() {
-        }
-        return C;
-    }());
+    class C {
+    }
     (function (C) {
         var t;
     })(C = M.C || (M.C = {}));
 })(M || (M = {}));
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
index 25e855e4ac89b..33e779c2f689f 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.symbols
@@ -1,137 +1,143 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 === duplicateSymbolsExportMatching.ts ===
+<<<<<<< HEAD
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+namespace M {
+=======
+namespace M {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 10), Decl(duplicateSymbolsExportMatching.ts, 4, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 1, 26))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 7, 26))
 }
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
     export interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 0, 10), Decl(duplicateSymbolsExportMatching.ts, 4, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10))
 
     interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 5, 26))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 26))
 }
 
 // Doesn't match export visibility, but it's in a different parent, so it's ok
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
     interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 10, 10))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 16, 10))
 
     export interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 17, 19))
 }
 
 module N {
->N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 13, 1))
+>N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 19, 1))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19))
 
     interface I { } // ok
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 15, 10), Decl(duplicateSymbolsExportMatching.ts, 16, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19))
 
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26))
 
     export interface E { } // ok
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 17, 19), Decl(duplicateSymbolsExportMatching.ts, 18, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26))
 }
 
 module N2 {
->N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 20, 1))
+>N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 26, 1))
 
     interface I { }
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 22, 11), Decl(duplicateSymbolsExportMatching.ts, 23, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 28, 11), Decl(duplicateSymbolsExportMatching.ts, 29, 19))
 
     export interface I { } // error
->I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 23, 19))
+>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 29, 19))
 
     export interface E { }
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 24, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26))
 
     interface E { } // error
->E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 24, 26), Decl(duplicateSymbolsExportMatching.ts, 25, 26))
+>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26), Decl(duplicateSymbolsExportMatching.ts, 31, 26))
 }
 
 // Should report error only once for instantiated module
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
     module inst {
->inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 30, 10), Decl(duplicateSymbolsExportMatching.ts, 33, 5))
+>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 36, 10), Decl(duplicateSymbolsExportMatching.ts, 39, 5))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 32, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 38, 11))
     }
     export module inst { // one error
->inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 33, 5))
+>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 39, 5))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 35, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 41, 11))
     }
 }
 
 // Variables of the same / different type
 module M2 {
->M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 37, 1))
+>M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 43, 1))
 
     var v: string;
->v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 41, 7), Decl(duplicateSymbolsExportMatching.ts, 42, 14))
+>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 47, 7), Decl(duplicateSymbolsExportMatching.ts, 48, 14))
 
     export var v: string; // one error (visibility)
->v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 42, 14))
+>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 48, 14))
 
     var w: number;
->w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 43, 7), Decl(duplicateSymbolsExportMatching.ts, 44, 14))
+>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 49, 7), Decl(duplicateSymbolsExportMatching.ts, 50, 14))
 
     export var w: string; // two errors (visibility and type mismatch)
->w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 44, 14))
+>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 50, 14))
 }
 
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
     module F {
->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5), Decl(duplicateSymbolsExportMatching.ts, 47, 10))
+>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5), Decl(duplicateSymbolsExportMatching.ts, 53, 10))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 49, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 55, 11))
     }
     export function F() { } // Only one error for duplicate identifier (don't consider visibility)
->F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 50, 5))
+>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5))
 }
 
 module M {
->M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 3, 1), Decl(duplicateSymbolsExportMatching.ts, 7, 1), Decl(duplicateSymbolsExportMatching.ts, 27, 1), Decl(duplicateSymbolsExportMatching.ts, 45, 1) ... and 1 more)
+>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more)
 
     class C { }
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16))
 
     module C { }
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 54, 10), Decl(duplicateSymbolsExportMatching.ts, 55, 15), Decl(duplicateSymbolsExportMatching.ts, 56, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16))
 
     export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
->C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 56, 16))
+>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 62, 16))
 
         var t;
->t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 58, 11))
+>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 64, 11))
     }
 }
 
 // Top level
 interface D { }
->D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 60, 1), Decl(duplicateSymbolsExportMatching.ts, 63, 15))
+>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 66, 1), Decl(duplicateSymbolsExportMatching.ts, 69, 15))
 
 export interface D { }
->D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 63, 15))
+>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 69, 15))
 
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.types b/tests/baselines/reference/duplicateSymbolsExportMatching.types
index 6681ea14860af..3b712393fe1ad 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.types
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.types
@@ -1,7 +1,13 @@
 //// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] ////
 
 === duplicateSymbolsExportMatching.ts ===
+<<<<<<< HEAD
 module M {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+namespace M {
+=======
+namespace M {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface E { }
     interface I { }
 }
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 2965406e35bcb..0f7d2e0f4f325 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -38,68 +38,6 @@ import M3 from "M3";
 
 
 //// [es5ModuleInternalNamedImports.js]
-<<<<<<< HEAD
-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
-        class M_C {
-        }
-        M.M_C = M_C;
-        // instantiated module
-        let 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
-        let M_E;
-        (function (M_E) {
-        })(M_E = M.M_E || (M.M_E = {}));
-        // alias
-        M.M_A = M_M;
-    })(M || (exports.M = M = {}));
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 = {}));
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.M = void 0;
@@ -108,14 +46,11 @@ var M;
     // variable
     M.M_V = 0;
     //calss
-    var M_C = /** @class */ (function () {
-        function M_C() {
-        }
-        return M_C;
-    }());
+    class M_C {
+    }
     M.M_C = M_C;
     // instantiated module
-    var M_M;
+    let M_M;
     (function (M_M) {
         var x;
     })(M_M = M.M_M || (M.M_M = {}));
@@ -123,10 +58,9 @@ var M;
     function M_F() { }
     M.M_F = M_F;
     // enum
-    var M_E;
+    let M_E;
     (function (M_E) {
     })(M_E = M.M_E || (M.M_E = {}));
     // alias
     M.M_A = M_M;
 })(M || (exports.M = M = {}));
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/es6ExportAll.errors.txt b/tests/baselines/reference/es6ExportAll.errors.txt
index b4a0ac07bb257..7f82e0182cc7b 100644
--- a/tests/baselines/reference/es6ExportAll.errors.txt
+++ b/tests/baselines/reference/es6ExportAll.errors.txt
@@ -6,11 +6,11 @@ client.ts(1,15): error TS2307: Cannot find module 'server' or its corresponding
     }
     export interface i {
     }
-    export namespace m {
+    export module m {
         export var x = 10;
     }
     export var x = 10;
-    export namespace uninstantiated {
+    export module uninstantiated {
     }
     
 ==== client.ts (1 errors) ====
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index 1879e3fa62b7e..f8d5f05014422 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -16,19 +16,7 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-<<<<<<< HEAD
-define(["require", "exports", "server"], function (require, exports, server_1) {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-define(["require", "exports", "server"], function (require, exports, server_1) {
-=======
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "./server"], function (require, exports, server_1) {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 4bd9fdd870ba6..879270828de56 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -17,19 +17,7 @@ define(["require", "exports"], function (require, exports) {
     exports.default = a;
 });
 //// [client.js]
-<<<<<<< HEAD
-define(["require", "exports", "server"], function (require, exports, server_1) {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-define(["require", "exports", "server"], function (require, exports, server_1) {
-=======
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 define(["require", "exports", "./server"], function (require, exports, server_1) {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index c271799f38ebe..53bdb8233e90b 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -15,34 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
 //// [client.js]
-<<<<<<< HEAD
-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;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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;
-});
-=======
 "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 = server_1.default;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [server.d.ts]
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/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/exportAssignmentAndDeclaration.js b/tests/baselines/reference/exportAssignmentAndDeclaration.js
index fda68b3fd6ffc..b94c4d9a72e10 100644
--- a/tests/baselines/reference/exportAssignmentAndDeclaration.js
+++ b/tests/baselines/reference/exportAssignmentAndDeclaration.js
@@ -13,33 +13,6 @@ class C1 {
 export = C1;
 
 //// [foo_0.js]
-<<<<<<< HEAD
-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 = {}));
-    class C1 {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-    }());
-=======
 "use strict";
 exports.E1 = void 0;
 var E1;
@@ -48,10 +21,6 @@ var E1;
     E1[E1["B"] = 1] = "B";
     E1[E1["C"] = 2] = "C";
 })(E1 || (exports.E1 = E1 = {}));
-var C1 = /** @class */ (function () {
-    function C1() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return C1;
-}());
+class C1 {
+}
 module.exports = C1;
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.errors.txt b/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
index 8139a2496da62..2adce111ea1a6 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
+++ b/tests/baselines/reference/exportAssignmentCircularModules.errors.txt
@@ -4,21 +4,21 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module Foo {
     	export var x = foo0.x;
     }
     export = Foo;
     
 ==== foo_0.ts (0 errors) ====
     import foo1 = require('./foo_1');
-    namespace Foo {
+    module Foo {
     	export var x = foo1.x;
     }
     export = Foo;
     
 ==== foo_1.ts (0 errors) ====
     import foo2 = require("./foo_2");
-    namespace Foo {
+    module Foo {
     	export var x = foo2.x;
     }
     export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentError.errors.txt b/tests/baselines/reference/exportAssignmentError.errors.txt
index e61d4a7a08bfe..31bbc7bd653ce 100644
--- a/tests/baselines/reference/exportAssignmentError.errors.txt
+++ b/tests/baselines/reference/exportAssignmentError.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    module M {
     	export var x;
     }
     
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.errors.txt b/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
index 08a6ff256afc4..cd57a8f3efa3b 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentInternalModule.errors.txt
@@ -7,7 +7,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     
     var n: number = modM.x;
 ==== exportAssignmentInternalModule_A.ts (0 errors) ====
-    namespace M {
+    module M {
     	export var x;
     }
     
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
index 4871c9caa789a..40c6c56d4ac0c 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.errors.txt
@@ -12,7 +12,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     class Foo {
     	test = "test";
     }
-    namespace Foo {
+    module Foo {
     	export var answer = 42;
     }
     export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
index 47a3c979cdc64..f5bc5ed597938 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.errors.txt
@@ -13,7 +13,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     enum foo {
     	red, green, blue
     }
-    namespace foo {
+    module foo {
     	export var answer = 42;
     }
     export = foo;
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
index 3194b2bcde931..ec6313bddeafe 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.errors.txt
@@ -12,7 +12,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     function foo() {
     	return "test";
     }
-    namespace foo {
+    module foo {
     	export var answer = 42;
     }
     export = foo;
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
index e6bee6ac2e5bb..3dc69a387528a 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.errors.txt
@@ -9,7 +9,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     }
     
 ==== foo_0.ts (0 errors) ====
-    namespace Foo {
+    module Foo {
     	export var answer = 42;
     }
     export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
index 9059f5e6fa00c..2135958682b2a 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    module m2 {
         export interface connectModule {
             (res, req, next): void;
         }
@@ -14,7 +14,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     
     }
     
-    namespace M {
+    module M {
         export var server: {
             (): m2.connectExport;
             test1: m2.connectModule;
diff --git a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
index ba44def77ef37..74bd5f32c2ea0 100644
--- a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
+++ b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt
@@ -1,5 +1,4 @@
 /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) ====
@@ -8,8 +7,5 @@
 !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
     function bar() {}
     
-==== /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
+==== /foo.ts (0 errors) ====
+    import bar from './bar';
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types b/tests/baselines/reference/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types
index 8777fae23902b..927a7075cfaac 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 : any
->    : ^^^
+>bar : () => void
+>    : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/exportEqualNamespaces.errors.txt b/tests/baselines/reference/exportEqualNamespaces.errors.txt
index ca17006547792..0e3e457bf5789 100644
--- a/tests/baselines/reference/exportEqualNamespaces.errors.txt
+++ b/tests/baselines/reference/exportEqualNamespaces.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    declare module server {
         interface Server extends Object { }
     }
     
diff --git a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
index 08a44fab214f6..ae2a231a8e066 100644
--- a/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
+++ b/tests/baselines/reference/exportImportCanSubstituteConstEnumForValue.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    module MsPortalFx.ViewModels.Dialogs {
     
         export const enum DialogResult {
             Abort,
@@ -33,7 +33,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     }
     
     
-    namespace MsPortalFx.ViewModels {
+    module MsPortalFx.ViewModels {
     
         /**
          * For some reason javascript code is emitted for this re-exported const enum.
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index c129df85ae67f..93aa3f0d54387 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,71 +20,21 @@ namespace NS1 {
 }
 
 //// [exportedBlockScopedDeclarations.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.bar1 = exports.bar = void 0;
-    const foo = foo; // compile error
-    exports.bar = exports.bar; // should be compile error
-    function f() {
-        const bar = bar; // compile error
-    }
-    var NS;
-    (function (NS) {
-        NS.bar = NS.bar; // should be compile error
-    })(NS || (NS = {}));
-    let foo1 = foo1; // compile error
-    exports.bar1 = exports.bar1; // should be compile error
-    function f1() {
-        let bar1 = bar1; // compile error
-    }
-    var NS1;
-    (function (NS1) {
-        NS1.bar1 = NS1.bar1; // should be compile error
-    })(NS1 || (NS1 = {}));
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 = {}));
-});
-=======
-var foo = foo; // compile error
-export var bar = bar; // should be compile error
+const foo = foo; // compile error
+export const bar = bar; // should be compile error
 function f() {
-    var bar = bar; // compile error
+    const 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
+let foo1 = foo1; // compile error
+export let bar1 = bar1; // should be compile error
 function f1() {
-    var bar1 = bar1; // compile error
+    let bar1 = bar1; // compile error
 }
 var NS1;
 (function (NS1) {
     NS1.bar1 = NS1.bar1; // should be compile error
 })(NS1 || (NS1 = {}));
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/exportsAndImports1-amd.errors.txt b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
index 0e8bd2772b0ce..ca909d7633989 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.errors.txt
+++ b/tests/baselines/reference/exportsAndImports1-amd.errors.txt
@@ -15,10 +15,10 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     const enum D {
         A, B, C
     }
-    namespace M {
+    module M {
         export var x;
     }
-    namespace N {
+    module N {
         export interface I {
         }
     }
diff --git a/tests/baselines/reference/exportsAndImports3-amd.errors.txt b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
index 524d3ac67f62d..38a1f822f0f1b 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.errors.txt
+++ b/tests/baselines/reference/exportsAndImports3-amd.errors.txt
@@ -15,10 +15,10 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     export const enum D {
         A, B, C
     }
-    export namespace M {
+    export module M {
         export var x;
     }
-    export namespace N {
+    export module N {
         export interface I {
         }
     }
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index b83e06121b868..ac1802e7c399d 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,46 +7,10 @@ export class C {
 }
 
 //// [fieldAndGetterWithSameName.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.C = void 0;
-    class C {
-        get x() { return 1; }
-    }
-    exports.C = C;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "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;
-}());
+class C {
+    get x() { return 1; }
+}
 exports.C = C;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index 5775fd17c89aa..121c82c788a95 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,109 +25,24 @@ export class BuildResult<A, B, C>{
 
 
 //// [genericMemberFunction.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.BuildResult = exports.FileWithErrors = exports.BuildError = void 0;
-    class BuildError {
-        parent() {
-            return undefined;
-        }
-    }
-    exports.BuildError = BuildError;
-    class FileWithErrors {
-        errors() {
-            return undefined;
-        }
-        parent() {
-            return undefined;
-        }
-    }
-    exports.FileWithErrors = FileWithErrors;
-    class BuildResult {
-        merge(other) {
-            a.b.c.d.e.f.g = 0;
-            removedFiles.forEach((each) => {
-                this.removeFile(each);
-            });
-        }
-    }
-    exports.BuildResult = BuildResult;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
-var BuildError = /** @class */ (function () {
-    function BuildError() {
-    }
-    BuildError.prototype.parent = function () {
+export class BuildError {
+    parent() {
         return undefined;
-    };
-    return BuildError;
-}());
-export { BuildError };
-var FileWithErrors = /** @class */ (function () {
-    function FileWithErrors() {
     }
-    FileWithErrors.prototype.errors = function () {
+}
+export class FileWithErrors {
+    errors() {
         return undefined;
-    };
-    FileWithErrors.prototype.parent = function () {
+    }
+    parent() {
         return undefined;
-    };
-    return FileWithErrors;
-}());
-export { FileWithErrors };
-var BuildResult = /** @class */ (function () {
-    function BuildResult() {
     }
-    BuildResult.prototype.merge = function (other) {
-        var _this = this;
+}
+export class BuildResult {
+    merge(other) {
         a.b.c.d.e.f.g = 0;
-        removedFiles.forEach(function (each) {
-            _this.removeFile(each);
+        removedFiles.forEach((each) => {
+            this.removeFile(each);
         });
-    };
-    return BuildResult;
-}());
-export { BuildResult };
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    }
+}
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 3c05d851610d1..efa81131693e5 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,48 +11,10 @@ export class DbSet<T> {
 
 
 //// [genericReturnTypeFromGetter1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.DbSet = void 0;
-    class DbSet {
-        get entityType() { return this._entityType; } // used to ICE without return type annotation
-    }
-    exports.DbSet = DbSet;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "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;
-}());
+class DbSet {
+    get entityType() { return this._entityType; } // used to ICE without return type annotation
+}
 exports.DbSet = DbSet;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index e556e562d9148..9cd283244d59b 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,47 +684,6 @@ export declare module eaM {
 }
 
 //// [giant.js]
-<<<<<<< HEAD
-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
-    */
-    const p = "propName";
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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";
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eM = exports.eC = exports.eV = void 0;
@@ -742,57 +701,30 @@ exports.eF = eF;
 
     MAX DEPTH 3 LEVELS
 */
-var p = "propName";
+const 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;
-}());
+class C {
+    constructor() { }
+    pF() { }
+    rF() { }
+    pgF() { }
+    get pgF() { }
+    psF(param) { }
+    set psF(param) { }
+    rgF() { }
+    get rgF() { }
+    rsF(param) { }
+    set rsF(param) { }
+    static tF() { }
+    static tsF(param) { }
+    static set tsF(param) { }
+    static tgF() { }
+    static get tgF() { }
+}
 var M;
 (function (M_1) {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     var V;
     function F() { }
     ;
@@ -814,277 +746,32 @@ var M;
         static tgF() { }
         static get tgF() { }
     }
-    var M;
+    let M;
     (function (M) {
         var V;
         function F() { }
         ;
-<<<<<<< HEAD
         class C {
-            constructor() { }
-            pF() { }
-            rF() { }
-            pgF() { }
-            get pgF() { }
-            psF(param) { }
-            set psF(param) { }
-            rgF() { }
-            get rgF() { }
-            rsF(param) { }
-            set rsF(param) { }
-            static tF() { }
-            static tsF(param) { }
-            static set tsF(param) { }
-            static tgF() { }
-            static get tgF() { }
         }
-        let M;
-        (function (M) {
-            var V;
-            function F() { }
-            ;
-            class C {
-            }
-            ;
-            ;
-            ;
-            function eF() { }
-            M.eF = eF;
-            ;
-            class eC {
-            }
-            M.eC = eC;
-            ;
-            ;
-            ;
-            ;
-            ;
-            ;
-        })(M || (M = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        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 = {}));
-=======
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
         ;
         ;
         ;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         function eF() { }
         M.eF = eF;
         ;
-<<<<<<< HEAD
         class eC {
-            constructor() { }
-            pF() { }
-            rF() { }
-            pgF() { }
-            get pgF() { }
-            psF(param) { }
-            set psF(param) { }
-            rgF() { }
-            get rgF() { }
-            rsF(param) { }
-            set rsF(param) { }
-            static tF() { }
-            static tsF(param) { }
-            static set tsF(param) { }
-            static tgF() { }
-            static get tgF() { }
         }
-        M_1.eC = eC;
-        let eM;
-        (function (eM) {
-            var V;
-            function F() { }
-            ;
-            class C {
-            }
-            ;
-            ;
-            ;
-            function eF() { }
-            eM.eF = eF;
-            ;
-            class eC {
-            }
-            eM.eC = eC;
-            ;
-            ;
-            ;
-            ;
-            ;
-            ;
-        })(eM = M_1.eM || (M_1.eM = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        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 = {}));
-=======
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
         M.eC = eC;
         ;
         ;
         ;
         ;
         ;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         ;
     })(M || (M = {}));
     function eF() { }
     M_1.eF = eF;
     ;
-<<<<<<< HEAD
     class eC {
         constructor() { }
         pF() { }
@@ -1103,360 +790,23 @@ var M;
         static tgF() { }
         static get tgF() { }
     }
-    exports.eC = eC;
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    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 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;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    var eM;
+    let eM;
     (function (eM) {
         var V;
         function F() { }
         ;
-<<<<<<< HEAD
         class C {
-            constructor() { }
-            pF() { }
-            rF() { }
-            pgF() { }
-            get pgF() { }
-            psF(param) { }
-            set psF(param) { }
-            rgF() { }
-            get rgF() { }
-            rsF(param) { }
-            set rsF(param) { }
-            static tF() { }
-            static tsF(param) { }
-            static set tsF(param) { }
-            static tgF() { }
-            static get tgF() { }
         }
-        let M;
-        (function (M) {
-            var V;
-            function F() { }
-            ;
-            class C {
-            }
-            ;
-            ;
-            ;
-            function eF() { }
-            M.eF = eF;
-            ;
-            class eC {
-            }
-            M.eC = eC;
-            ;
-            ;
-            ;
-            ;
-            ;
-            ;
-        })(M || (M = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        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 = {}));
-=======
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
         ;
         ;
         ;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         function eF() { }
         eM.eF = eF;
         ;
-<<<<<<< HEAD
         class eC {
-            constructor() { }
-            pF() { }
-            rF() { }
-            pgF() { }
-            get pgF() { }
-            psF(param) { }
-            set psF(param) { }
-            rgF() { }
-            get rgF() { }
-            rsF(param) { }
-            set rsF(param) { }
-            static tF() { }
-            static tsF(param) { }
-            static set tsF(param) { }
-            static tgF() { }
-            static get tgF() { }
         }
-        eM_1.eC = eC;
-        let eM;
-        (function (eM) {
-            var V;
-            function F() { }
-            ;
-            class C {
-            }
-            ;
-            ;
-            ;
-            function eF() { }
-            eM.eF = eF;
-            ;
-            class eC {
-            }
-            eM.eC = eC;
-            ;
-            ;
-            ;
-            ;
-            ;
-            ;
-        })(eM = eM_1.eM || (eM_1.eM = {}));
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        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_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 = {}));
-=======
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
         eM.eC = eC;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         ;
         ;
         ;
@@ -1468,121 +818,63 @@ var M;
 })(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;
-}());
+class eC {
+    constructor() { }
+    pF() { }
+    rF() { }
+    pgF() { }
+    get pgF() { }
+    psF(param) { }
+    set psF(param) { }
+    rgF() { }
+    get rgF() { }
+    rsF(param) { }
+    set rsF(param) { }
+    static tF() { }
+    static tsF(param) { }
+    static set tsF(param) { }
+    static tgF() { }
+    static get tgF() { }
+}
 exports.eC = eC;
 var 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;
+    class C {
+        constructor() { }
+        pF() { }
+        rF() { }
+        pgF() { }
+        get pgF() { }
+        psF(param) { }
+        set psF(param) { }
+        rgF() { }
+        get rgF() { }
+        rsF(param) { }
+        set rsF(param) { }
+        static tF() { }
+        static tsF(param) { }
+        static set tsF(param) { }
+        static tgF() { }
+        static get tgF() { }
+    }
+    let M;
     (function (M) {
         var V;
         function F() { }
         ;
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
+        class C {
+        }
         ;
         ;
         ;
         function eF() { }
         M.eF = eF;
         ;
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
+        class eC {
+        }
         M.eC = eC;
         ;
         ;
@@ -1594,72 +886,40 @@ var eM;
     function 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;
-    }());
+    class eC {
+        constructor() { }
+        pF() { }
+        rF() { }
+        pgF() { }
+        get pgF() { }
+        psF(param) { }
+        set psF(param) { }
+        rgF() { }
+        get rgF() { }
+        rsF(param) { }
+        set rsF(param) { }
+        static tF() { }
+        static tsF(param) { }
+        static set tsF(param) { }
+        static tgF() { }
+        static get tgF() { }
+    }
     eM_1.eC = eC;
-    var eM;
+    let eM;
     (function (eM) {
         var V;
         function F() { }
         ;
-        var C = /** @class */ (function () {
-            function C() {
-            }
-            return C;
-        }());
+        class C {
+        }
         ;
         ;
         ;
         function eF() { }
         eM.eF = eF;
         ;
-        var eC = /** @class */ (function () {
-            function eC() {
-            }
-            return eC;
-        }());
+        class eC {
+        }
         eM.eC = eC;
         ;
         ;
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt
index 0bfcbbd5ac606..12e30795fff58 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.errors.txt
+++ b/tests/baselines/reference/importDeclWithClassModifiers.errors.txt
@@ -10,7 +10,7 @@ importDeclWithClassModifiers.ts(7,28): error TS2694: Namespace 'x' has no export
 
 
 ==== importDeclWithClassModifiers.ts (9 errors) ====
-    module x {
+    namespace x {
         interface c {
         }
     }
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index de60de73c1a28..8225d825e9fcb 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/importDeclWithClassModifiers.ts] ////
 
 //// [importDeclWithClassModifiers.ts]
-module x {
+namespace x {
     interface c {
     }
 }
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.symbols b/tests/baselines/reference/importDeclWithClassModifiers.symbols
index afc0084ffeda6..4defa696fbda4 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.symbols
+++ b/tests/baselines/reference/importDeclWithClassModifiers.symbols
@@ -1,11 +1,11 @@
 //// [tests/cases/compiler/importDeclWithClassModifiers.ts] ////
 
 === importDeclWithClassModifiers.ts ===
-module x {
+namespace x {
 >x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0))
 
     interface c {
->c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 0, 10))
+>c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 0, 13))
     }
 }
 export public import a = x.c;
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.types b/tests/baselines/reference/importDeclWithClassModifiers.types
index 04fd882d591d6..48e980cd29f79 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.types
+++ b/tests/baselines/reference/importDeclWithClassModifiers.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/importDeclWithClassModifiers.ts] ////
 
 === importDeclWithClassModifiers.ts ===
-module x {
+namespace x {
     interface c {
     }
 }
diff --git a/tests/baselines/reference/importHelpers.symbols b/tests/baselines/reference/importHelpers.symbols
index dedab7969290a..b5129fc7168c3 100644
--- a/tests/baselines/reference/importHelpers.symbols
+++ b/tests/baselines/reference/importHelpers.symbols
@@ -78,25 +78,11 @@ const result = id`hello world`;
 
 === node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
 >d : Symbol(d, Decl(index.d.ts, 0, 34))
->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, --, --))
 >b : Symbol(b, Decl(index.d.ts, 0, 46))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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))
@@ -104,94 +90,34 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >sources : Symbol(sources, Decl(index.d.ts, 1, 40))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-=======
 >__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
 >decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
->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, --, --))
 >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))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__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))
->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, --, --))
 >generator : Symbol(generator, Decl(index.d.ts, 5, 77))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
 export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray;
 >__makeTemplateObject : Symbol(__makeTemplateObject, Decl(index.d.ts, 5, 104))
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.symbols b/tests/baselines/reference/importHelpersInIsolatedModules.symbols
index 33d1bc1a5366a..dd10b49a537f4 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.symbols
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.symbols
@@ -50,25 +50,11 @@ class C {
 
 === node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
 >d : Symbol(d, Decl(index.d.ts, 0, 34))
->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, --, --))
 >b : Symbol(b, Decl(index.d.ts, 0, 46))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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))
@@ -76,92 +62,32 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >sources : Symbol(sources, Decl(index.d.ts, 1, 40))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-=======
 >__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
 >decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
->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, --, --))
 >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))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__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))
->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, --, --))
 >generator : Symbol(generator, Decl(index.d.ts, 5, 77))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpersInTsx.symbols b/tests/baselines/reference/importHelpersInTsx.symbols
index 2fe7743bf4c70..e6c5d0a6f3f74 100644
--- a/tests/baselines/reference/importHelpersInTsx.symbols
+++ b/tests/baselines/reference/importHelpersInTsx.symbols
@@ -24,25 +24,11 @@ const x = <span {...o} />
 
 === node_modules/tslib/index.d.ts ===
 export declare function __extends(d: Function, b: Function): void;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__extends : Symbol(__extends, Decl(index.d.ts, 0, 0))
 >d : Symbol(d, Decl(index.d.ts, 0, 34))
->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, --, --))
 >b : Symbol(b, Decl(index.d.ts, 0, 46))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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))
@@ -50,92 +36,32 @@ export declare function __assign(t: any, ...sources: any[]): any;
 >sources : Symbol(sources, Decl(index.d.ts, 1, 40))
 
 export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(tslib.d.ts, --, --))
->key : Symbol(key, Decl(tslib.d.ts, --, --))
->desc : Symbol(desc, Decl(tslib.d.ts, --, --))
-=======
 >__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65))
 >decorators : Symbol(decorators, Decl(index.d.ts, 2, 35))
->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, --, --))
 >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))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 export declare function __param(paramIndex: number, decorator: Function): Function;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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, --, --))
-=======
 >__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))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>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;
-<<<<<<< HEAD
->__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(tslib.d.ts, --, --))
->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
->__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(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, --, --))
-=======
 >__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))
->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, --, --))
 >generator : Symbol(generator, Decl(index.d.ts, 5, 77))
->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, --, --))
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
index 141210d0665cd..58a5e5b8bdf6e 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
index 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).types
@@ -19,4 +19,5 @@ 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
index 39c8e6d0d2a12..5293f7ed56503 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
index 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).types
@@ -19,4 +19,5 @@ 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
index 9fdf9d0c057da..266be01be8043 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
index 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).types
@@ -36,4 +36,5 @@ 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
index fa3348a608424..f64e9f067def7 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
index 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).types
@@ -36,4 +36,5 @@ 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
index 6e988f05c114f..f8c1dfd1ec39f 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
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
index 852516e62df99..fad0b50808aed 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).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.
 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 { }
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
index ee8cd804ecc33..eef61dd5e5f50 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
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
index eae445c8285d1..8d058056eeff8 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).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.
 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 { }
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
index 8650f643f5fa6..a61550b1c96ad 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
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
index d13aa2bb27c74..138103b44592d 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
index 01b868c786d50..c51743ffe171a 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
index 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).types
@@ -23,4 +23,5 @@ 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
index 09917c6b0ff74..102eafd56a8f3 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
index 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).types
@@ -23,4 +23,5 @@ declare module "tslib" {
 >__importStar : (m: any) => void
 >             : ^ ^^   ^^^^^    
 >m : any
+>  : ^^^
 }
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 b1007c7dd329d..1eac096a539bb 100644
--- a/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
+++ b/tests/baselines/reference/importMeta(module=system,target=es5).errors.txt
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 error TS2468: Cannot find global value 'Promise'.
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-=======
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
@@ -15,15 +11,9 @@ 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'?
 
 
-<<<<<<< HEAD
 !!! error TS2468: Cannot find global value 'Promise'.
-==== example.ts (2 errors) ====
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-==== example.ts (1 errors) ====
-=======
 !!! 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) ====
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== example.ts (2 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 b1007c7dd329d..1eac096a539bb 100644
--- a/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
+++ b/tests/baselines/reference/importMeta(module=system,target=esnext).errors.txt
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
 error TS2468: Cannot find global value 'Promise'.
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-=======
 error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
@@ -15,15 +11,9 @@ 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'?
 
 
-<<<<<<< HEAD
 !!! error TS2468: Cannot find global value 'Promise'.
-==== example.ts (2 errors) ====
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-==== example.ts (1 errors) ====
-=======
 !!! 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) ====
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== example.ts (2 errors) ====
     // Adapted from https://github.com/tc39/proposal-import-meta/tree/c3902a9ffe2e69a7ac42c19d7ea74cbdcea9b7fb#example
     (async () => {
      ~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/import_reference-exported-alias.errors.txt b/tests/baselines/reference/import_reference-exported-alias.errors.txt
index 83ee7312a7f92..743c853c47a5e 100644
--- a/tests/baselines/reference/import_reference-exported-alias.errors.txt
+++ b/tests/baselines/reference/import_reference-exported-alias.errors.txt
@@ -9,8 +9,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var x = new UserServices().getUserName();
     
 ==== file1.ts (0 errors) ====
-    namespace App {
-        export namespace Services {
+    module App {
+        export module Services {
             export class UserServices {
                 public getUserName(): string {
                     return "Bill Gates";
diff --git a/tests/baselines/reference/import_reference-to-type-alias.errors.txt b/tests/baselines/reference/import_reference-to-type-alias.errors.txt
index c2a56c65c3c83..7651e1651e6a3 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.errors.txt
+++ b/tests/baselines/reference/import_reference-to-type-alias.errors.txt
@@ -8,8 +8,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     var x = new Services.UserServices().getUserName();
     
 ==== file1.ts (0 errors) ====
-    export namespace App {
-        export namespace Services {
+    export module App {
+        export module Services {
             export class UserServices {
                 public getUserName(): string {
                     return "Bill Gates";
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.errors.txt b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
index 403509739a312..9e03ddbf655c6 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
+++ b/tests/baselines/reference/importedAliasesInTypePositions.errors.txt
@@ -6,13 +6,13 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     import RT_ALIAS = require("file1");
     import ReferredTo = RT_ALIAS.elaborate.nested.mod.name.ReferredTo;
     
-    export namespace ImportingModule {
+    export module ImportingModule {
         class UsesReferredType {
             constructor(private referred: ReferredTo) { }
         }
     }
 ==== file1.ts (0 errors) ====
-    export namespace elaborate.nested.mod.name {
+    export module elaborate.nested.mod.name {
         export class ReferredTo {
             doSomething(): void {
             }
diff --git a/tests/baselines/reference/importedModuleClassNameClash.errors.txt b/tests/baselines/reference/importedModuleClassNameClash.errors.txt
index 1e6002bf6463a..35a2559188cb2 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.errors.txt
+++ b/tests/baselines/reference/importedModuleClassNameClash.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 ==== importedModuleClassNameClash.ts (0 errors) ====
     import foo = m1;
      
-    export namespace m1 { }
+    export module m1 { }
      
     class foo { }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index fada60d350710..2763348d3340c 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,170 +58,34 @@ interface I2 extends I1 { item:string; }
 
 
 //// [interfaceDeclaration3.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.M2 = void 0;
-    var M1;
-    (function (M1) {
-        class C1 {
-        }
-        class C2 {
-        }
-        class C3 {
-        }
-        class C4 {
-        }
-        class C5 {
-        }
-    })(M1 || (M1 = {}));
-    var M2;
-    (function (M2) {
-        class C1 {
-        }
-        class C2 {
-        }
-        class C3 {
-        }
-    })(M2 || (exports.M2 = M2 = {}));
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.M2 = void 0;
+var M1;
+(function (M1) {
     class C1 {
     }
     class C2 {
     }
     class C3 {
     }
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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() {
-        }
-        return C1;
-    }());
-    var C2 = /** @class */ (function () {
-        function C2() {
-        }
-        return C2;
-    }());
-    var C3 = /** @class */ (function () {
-        function C3() {
-        }
-        return C3;
-    }());
-});
-=======
-"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;
-    }());
+    class C4 {
+    }
+    class 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() {
+    class C1 {
     }
-    return C1;
-}());
-var C2 = /** @class */ (function () {
-    function C2() {
+    class C2 {
     }
-    return C2;
-}());
-var C3 = /** @class */ (function () {
-    function C3() {
+    class C3 {
     }
-    return C3;
-}());
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+})(M2 || (exports.M2 = M2 = {}));
+class C1 {
+}
+class C2 {
+}
+class C3 {
+}
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 5c61f6cfab701..9e2344f6c2c27 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,81 +27,21 @@ export class Test {
 
 
 //// [interfaceImplementation6.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.Test = void 0;
-    class C1 {
-    }
-    class C2 {
-    }
-    class C3 {
-        constructor() {
-            var item;
-        }
-    }
-    class Test {
-        constructor() {
-            this.pt = { item: 1 };
-        }
-    }
-    exports.Test = Test;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "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() {
+class C1 {
+}
+class C2 {
+}
+class C3 {
+    constructor() {
         var item;
     }
-    return C3;
-}());
-var Test = /** @class */ (function () {
-    function Test() {
+}
+class Test {
+    constructor() {
         this.pt = { item: 1 };
     }
-    return Test;
-}());
+}
 exports.Test = Test;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
index 0e32f6de63ea9..bc5cf7af1f292 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export enum weekend {
             Friday,
             Saturday,
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
index e298ad48de0a9..5c3052bfd9fb8 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export enum weekend {
             Friday,
             Saturday,
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
index 87dffa8304ed4..bcaf7f2aa9f2d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export function foo(x: number) {
             return x;
         }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
index 8fe0f70788ede..6e038c8154d2f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.errors.txt
@@ -3,14 +3,14 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
+        export module b {
             export class c {
             }
         }
     }
     
-    export namespace c {
+    export module 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
index a4016a8b13c25..874a80007eac0 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.errors.txt
@@ -3,8 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
+        export module b {
             export class c {
             }
         }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
index aa8213b6a2dca..2d0e915eb0407 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.errors.txt
@@ -3,12 +3,12 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export interface I {
         }
     }
     
-    export namespace c {
+    export module c {
         export import b = a.I;
         export var x: b;
     }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
index e8c184fc74084..5ee3c16d52fc7 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.errors.txt
@@ -3,12 +3,12 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export interface I {
         }
     }
     
-    export namespace c {
+    export module c {
         import b = a.I;
         export var x: b;
     }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt
index 50f7568527293..ced31bd01b07e 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt
@@ -1,8 +1,26 @@
-internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(11,10): error TS2694: Namespace '"internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'.
+internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(1,1): error TS1185: Merge conflict marker encountered.
+internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(3,1): error TS1185: Merge conflict marker encountered.
+internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(5,1): error TS1185: Merge conflict marker encountered.
+internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(7,1): error TS1185: Merge conflict marker encountered.
+internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(17,10): error TS2694: Namespace '"internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'.
 
 
-==== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts (1 errors) ====
+==== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts (5 errors) ====
+    <<<<<<< HEAD
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
     export module a {
+    ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace a {
+    =======
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace a {
+    >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
         export interface I {
         }
     }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index e048bd275d78e..822dc5abab4c4 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -1,7 +1,13 @@
 //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] ////
 
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts]
+<<<<<<< HEAD
 export module a {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+=======
+export namespace a {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface I {
     }
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols
index a9f3433ee1530..ef6118207d31e 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols
@@ -1,29 +1,35 @@
 //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] ////
 
 === internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts ===
+<<<<<<< HEAD
 export module a {
 >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0))
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+=======
+export namespace a {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface I {
->I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 17))
+>I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 1, 17))
     }
 }
 
 export module c {
->c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 3, 1))
+>c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 9, 1))
 
     import b = a.I;
->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 17))
+>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 11, 17))
 >a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0))
->I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 17))
+>I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 1, 17))
 
     export var x: b;
->x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 7, 14))
->b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 5, 17))
+>x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 13, 14))
+>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 11, 17))
 }
 
 var x: c.b;
->x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 10, 3))
->c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 3, 1))
+>x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 16, 3))
+>c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 9, 1))
 >b : Symbol(c.b)
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
index 165ea92d0006b..167a3e9d9191d 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types
@@ -1,7 +1,13 @@
 //// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] ////
 
 === internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts ===
+<<<<<<< HEAD
 export module a {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+=======
+export namespace a {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     export interface I {
     }
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
index 8d4452ecab01f..bf43b307977f0 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export interface I {
         }
     }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
index be07530d9d519..33c67eae2a5a9 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt
@@ -1,9 +1,29 @@
-internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(16,17): error TS2694: Namespace '"internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'.
+internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(1,1): error TS1185: Merge conflict marker encountered.
+internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(4,1): error TS1185: Merge conflict marker encountered.
+internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(7,1): error TS1185: Merge conflict marker encountered.
+internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(10,1): error TS1185: Merge conflict marker encountered.
+internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(24,17): error TS2694: Namespace '"internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'.
 
 
-==== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts (1 errors) ====
+==== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts (5 errors) ====
+    <<<<<<< HEAD
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
     export module a {
         export module b {
+    ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace a {
+        export namespace b {
+    =======
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace a {
+        export namespace b {
+    >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
             export interface I {
                 foo();
             }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 6e0867ef4095f..c2dbe9592cbc8 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -1,8 +1,16 @@
 //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] ////
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts]
+<<<<<<< HEAD
 export module a {
     export module b {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+    export namespace b {
+=======
+export namespace a {
+    export namespace b {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         export interface I {
             foo();
         }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
index ae635ed5ad243..2deb9f31488ab 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols
@@ -1,44 +1,52 @@
 //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] ////
 
 === internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts ===
+<<<<<<< HEAD
 export module a {
 >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0))
 
     export module b {
->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17))
-
+>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 17))
+
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+    export namespace b {
+=======
+export namespace a {
+    export namespace b {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         export interface I {
->I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21))
+>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 21))
 
             foo();
->foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28))
+>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28))
         }
     }
 }
 
 export module c {
->c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 6, 1))
+>c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 14, 1))
 
     import b = a.b;
->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 17))
+>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 16, 17))
 >a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0))
->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 17))
+>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 17))
 
     export var x: b.I;
->x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 14))
->b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 8, 17))
->I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 21))
+>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 18, 14))
+>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 16, 17))
+>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 21))
 
     x.foo();
->x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28))
->x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 14))
->foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 28))
+>x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28))
+>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 18, 14))
+>foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28))
 }
 
 
 export var z: c.b.I;
->z : Symbol(z, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 15, 10))
->c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 6, 1))
+>z : Symbol(z, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 23, 10))
+>c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 14, 1))
 >b : Symbol(c.b)
 >I : Symbol(c.b.I)
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
index 80f13acba2db8..3c6438c08b277 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types
@@ -1,8 +1,16 @@
 //// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] ////
 
 === internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts ===
+<<<<<<< HEAD
 export module a {
     export module b {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace a {
+    export namespace b {
+=======
+export namespace a {
+    export namespace b {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
         export interface I {
             foo();
 >foo : () => any
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
index 09fb81b94ad55..255f7608a053a 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.errors.txt
@@ -3,8 +3,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
+        export module b {
             export interface I {
                 foo();
             }
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
index 2ba14d11d724b..85b2296e80466 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.errors.txt
@@ -3,11 +3,11 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export var x = 10;
     }
     
-    export namespace c {
+    export module c {
         export import b = a.x;
         export var bVal = b;
     }
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
index afe281be9a989..2ae4e3e7e6615 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.errors.txt
@@ -3,11 +3,11 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export var x = 10;
     }
     
-    export namespace c {
+    export module c {
         import b = a.x;
         export var bVal = b;
     }
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
index a634e250de0da..fff70b3c1530f 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module a {
         export var x = 10;
     }
     
diff --git a/tests/baselines/reference/moduleExportAliasImported.types b/tests/baselines/reference/moduleExportAliasImported.types
index d6a765c755544..5b05aacaf5bfc 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<{ (): void; version: 1; }>
->                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>import('./bug28014') : Promise<{ version: 1; default: { (): void; version: 1; }; }>
+>                     : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >'./bug28014' : "./bug28014"
 >             : ^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/moduleExports1.errors.txt b/tests/baselines/reference/moduleExports1.errors.txt
index 299a23e0e3243..94e406a31318e 100644
--- a/tests/baselines/reference/moduleExports1.errors.txt
+++ b/tests/baselines/reference/moduleExports1.errors.txt
@@ -1,9 +1,27 @@
-moduleExports1.ts(13,6): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
-moduleExports1.ts(13,22): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
+moduleExports1.ts(1,1): error TS1185: Merge conflict marker encountered.
+moduleExports1.ts(3,1): error TS1185: Merge conflict marker encountered.
+moduleExports1.ts(5,1): error TS1185: Merge conflict marker encountered.
+moduleExports1.ts(7,1): error TS1185: Merge conflict marker encountered.
+moduleExports1.ts(19,6): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
+moduleExports1.ts(19,22): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
 
-==== moduleExports1.ts (2 errors) ====
+==== moduleExports1.ts (6 errors) ====
+    <<<<<<< HEAD
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
     export module TypeScript.Strasse.Street {
+    ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace TypeScript.Strasse.Street {
+    =======
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
+    export namespace TypeScript.Strasse.Street {
+    >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+    ~~~~~~~
+!!! error TS1185: Merge conflict marker encountered.
     	export class Rue {
     		public address:string;
     	}	
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index d319bbe920bf3..f9c8c95e11995 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -1,7 +1,13 @@
 //// [tests/cases/compiler/moduleExports1.ts] ////
 
 //// [moduleExports1.ts]
+<<<<<<< HEAD
 export module TypeScript.Strasse.Street {
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace TypeScript.Strasse.Street {
+=======
+export namespace TypeScript.Strasse.Street {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 	export class Rue {
 		public address:string;
 	}	
@@ -16,56 +22,6 @@ void 0;
 if (!module.exports) module.exports = "";
 
 //// [moduleExports1.js]
-<<<<<<< HEAD
-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) {
-                class 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 = "";
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 = "";
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScript = void 0;
@@ -75,11 +31,8 @@ var TypeScript;
     (function (Strasse) {
         var Street;
         (function (Street) {
-            var Rue = /** @class */ (function () {
-                function Rue() {
-                }
-                return Rue;
-            }());
+            class Rue {
+            }
             Street.Rue = Rue;
         })(Street = Strasse.Street || (Strasse.Street = {}));
     })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {}));
@@ -89,4 +42,3 @@ rue.address = "1 Main Street";
 void 0;
 if (!module.exports)
     module.exports = "";
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/moduleExports1.symbols b/tests/baselines/reference/moduleExports1.symbols
index b0c54318c3d14..7a861a27b15df 100644
--- a/tests/baselines/reference/moduleExports1.symbols
+++ b/tests/baselines/reference/moduleExports1.symbols
@@ -1,33 +1,39 @@
 //// [tests/cases/compiler/moduleExports1.ts] ////
 
 === moduleExports1.ts ===
+<<<<<<< HEAD
 export module TypeScript.Strasse.Street {
 >TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0))
->Strasse : Symbol(Strasse, Decl(moduleExports1.ts, 0, 25))
->Street : Symbol(Street, Decl(moduleExports1.ts, 0, 33))
+>Strasse : Symbol(Strasse, Decl(moduleExports1.ts, 1, 25))
+>Street : Symbol(Street, Decl(moduleExports1.ts, 1, 33))
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace TypeScript.Strasse.Street {
+=======
+export namespace TypeScript.Strasse.Street {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 	export class Rue {
->Rue : Symbol(Rue, Decl(moduleExports1.ts, 0, 41))
+>Rue : Symbol(Rue, Decl(moduleExports1.ts, 1, 41))
 
 		public address:string;
->address : Symbol(Rue.address, Decl(moduleExports1.ts, 1, 19))
+>address : Symbol(Rue.address, Decl(moduleExports1.ts, 7, 19))
 	}	
 }
 
 var rue = new TypeScript.Strasse.Street.Rue();
->rue : Symbol(rue, Decl(moduleExports1.ts, 6, 3))
->TypeScript.Strasse.Street.Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 0, 41))
->TypeScript.Strasse.Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 0, 33))
->TypeScript.Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 0, 25))
+>rue : Symbol(rue, Decl(moduleExports1.ts, 12, 3))
+>TypeScript.Strasse.Street.Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 1, 41))
+>TypeScript.Strasse.Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 1, 33))
+>TypeScript.Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 1, 25))
 >TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0))
->Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 0, 25))
->Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 0, 33))
->Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 0, 41))
+>Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 1, 25))
+>Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 1, 33))
+>Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 1, 41))
 
 rue.address = "1 Main Street";
->rue.address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 1, 19))
->rue : Symbol(rue, Decl(moduleExports1.ts, 6, 3))
->address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 1, 19))
+>rue.address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 7, 19))
+>rue : Symbol(rue, Decl(moduleExports1.ts, 12, 3))
+>address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 7, 19))
 
 void 0;
 
diff --git a/tests/baselines/reference/moduleExports1.types b/tests/baselines/reference/moduleExports1.types
index 6aeb420d7ee37..5e9720ea7b3a8 100644
--- a/tests/baselines/reference/moduleExports1.types
+++ b/tests/baselines/reference/moduleExports1.types
@@ -1,6 +1,7 @@
 //// [tests/cases/compiler/moduleExports1.ts] ////
 
 === moduleExports1.ts ===
+<<<<<<< HEAD
 export module TypeScript.Strasse.Street {
 >TypeScript : typeof TypeScript
 >           : ^^^^^^^^^^^^^^^^^
@@ -9,6 +10,11 @@ export module TypeScript.Strasse.Street {
 >Street : typeof Street
 >       : ^^^^^^^^^^^^^
 
+||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export namespace TypeScript.Strasse.Street {
+=======
+export namespace TypeScript.Strasse.Street {
+>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 	export class Rue {
 >Rue : Rue
 >    : ^^^
diff --git a/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt
new file mode 100644
index 0000000000000..23839775ea15d
--- /dev/null
+++ b/tests/baselines/reference/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt
@@ -0,0 +1,55 @@
+/project/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.
+
+
+==== /project/tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "@shared/*": ["../shared/*"]
+            }
+        },
+       //"files": ["src/app.ts"]
+    }
+==== /project/src/app.ts (0 errors) ====
+    import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory
+    import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder
+    
+==== /shared/node_modules/troublesome-lib/package.json (0 errors) ====
+    {
+        "name": "troublesome-lib",
+        "version": "1.17.1"
+    }
+==== /shared/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ====
+    import { Option } from './Option';
+    export class Compactable {
+        option: Option;
+    }
+==== /shared/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ====
+    export class Option {
+        someProperty: string;
+    }
+==== /shared/lib/app.d.ts (0 errors) ====
+    import { Option } from "troublesome-lib/lib/Option";
+    export class SharedOption extends Option { }
+    export const makeSharedOption: () => SharedOption;
+==== /project/node_modules/anotherLib/index.d.ts (0 errors) ====
+    import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable
+==== /project/node_modules/troublesome-lib/package.json (0 errors) ====
+    {
+        "name": "troublesome-lib",
+        "version": "1.17.1"
+    }
+==== /project/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ====
+    import { Option } from './Option';
+    export class Compactable {
+        option: Option;
+    }
+==== /project/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ====
+    export class Option {
+        someProperty: string;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withPaths.errors.txt b/tests/baselines/reference/moduleResolutionWithExtensions_withPaths.errors.txt
index 2587c1b8e015d..389e538803259 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withPaths.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withPaths.errors.txt
@@ -1,16 +1,23 @@
+/tsconfig.json(6,3): 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.
 /tsconfig.json(7,23): 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.
 
 
-==== /tsconfig.json (1 errors) ====
+==== /tsconfig.json (2 errors) ====
     {
     	"compilerOptions": {
     		"outDir": "lib",
     		"target": "ES6",
     		"module": "ES6",
     		"baseUrl": "/",
+    		~~~~~~~~~
+!!! 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.
     		"moduleResolution": "Node",
     		                    ~~~~~~
 !!! 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.
     		"noImplicitAny": true,
     		"traceResolution": true,
     		"paths": {
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_empty.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_empty.errors.txt
index 5340a556ae601..b1672f87def9b 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_empty.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_empty.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": []
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_notSpecified.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_notSpecified.errors.txt
index 806fe2c84eca2..11f2ee099308e 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_notSpecified.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_notSpecified.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     	}
     }
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one.errors.txt
index 38eb8c1d4ecd2..bf1c1f10e3194 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_oneBlank.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_oneBlank.errors.txt
index e3997b190cb72..679362960699a 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_oneBlank.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_oneBlank.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [""]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_oneNotFound.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_oneNotFound.errors.txt
index 14e951443ce3b..b03a6481f3b00 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_oneNotFound.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_oneNotFound.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 /index.ts(1,21): error TS2307: Cannot find module './foo' or its corresponding type declarations.
 
 
@@ -8,6 +9,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt
index 0cf6e58012702..5c92db20079b5 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule.errors.txt
index 92a701e6a7a32..5e8484ec00b9f 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(6,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -10,6 +11,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt
index 151262113cc3e..dbd53a140ae73 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(6,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -10,6 +11,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt
index f433b11ed6640..76e8f535eb542 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt
@@ -1,7 +1,10 @@
 /tsconfig.json(6,23): 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.
+/tsconfig.json(9,3): 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.
 
 
-==== /tsconfig.json (1 errors) ====
+==== /tsconfig.json (2 errors) ====
     {
     	"compilerOptions": {
     		"allowJs": true,
@@ -10,9 +13,13 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"],
     		"baseUrl": "/",
+    		~~~~~~~~~
+!!! 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.
     		"paths": {
     			"some-library": ["node_modules/some-library/lib"],
     			"some-library/*": ["node_modules/some-library/lib/*"]
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt
index a74bab1368f06..45043bb0c4809 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(4,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -8,6 +9,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsModule.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsModule.errors.txt
index fa4fc2da349f2..bc5c802d10c07 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsModule.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsModule.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(6,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -10,6 +11,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsonModule.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsonModule.errors.txt
index 73a7bf7c6a2bf..8b2c1d5b4ad1d 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsonModule.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_one_jsonModule.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(6,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -10,6 +11,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": [".ios"]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt
index cac9052c8fe0d..b4ca34a3f60c6 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": ["-ios", "__native", ""]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt
index 2b642a1d4240f..21f1986086825 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": ["-ios", "__native", ""]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt
index 355ed32c08739..cf3c3af3c7ef6 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 
 
 ==== /tsconfig.json (1 errors) ====
@@ -7,6 +8,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": ["-ios", "__native", ""]
     	}
diff --git a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt
index 7e5c6fc204675..c80ae870600d7 100644
--- a/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt
+++ b/tests/baselines/reference/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(3,23): 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.
 /index.ts(1,22): error TS2307: Cannot find module './foo' or its corresponding type declarations.
 
 
@@ -8,6 +9,7 @@
     		"moduleResolution": "node",
     		                    ~~~~~~
 !!! 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.
     		"traceResolution": true,
     		"moduleSuffixes": ["-ios", "__native", ""]
     	}
diff --git a/tests/baselines/reference/node10AlternateResult_noResolution.errors.txt b/tests/baselines/reference/node10AlternateResult_noResolution.errors.txt
index dee485238c2c4..6d6771036e59e 100644
--- a/tests/baselines/reference/node10AlternateResult_noResolution.errors.txt
+++ b/tests/baselines/reference/node10AlternateResult_noResolution.errors.txt
@@ -1,9 +1,11 @@
 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.
 /index.ts(1,21): error TS2307: Cannot find module 'pkg' or its corresponding type declarations.
   There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'.
 
 
 !!! 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.
 ==== /node_modules/pkg/package.json (0 errors) ====
     {
         "name": "pkg",
diff --git a/tests/baselines/reference/node10Alternateresult_noTypes.errors.txt b/tests/baselines/reference/node10Alternateresult_noTypes.errors.txt
index 65eca3ffd926d..67cbf1889750b 100644
--- a/tests/baselines/reference/node10Alternateresult_noTypes.errors.txt
+++ b/tests/baselines/reference/node10Alternateresult_noTypes.errors.txt
@@ -1,4 +1,5 @@
 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 TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
   The file is in the program because:
     Root file specified for compilation
@@ -7,6 +8,7 @@ error TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you
 
 
 !!! 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.
 !!! error TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Root file specified for compilation
diff --git a/tests/baselines/reference/node10IsNode_node.errors.txt b/tests/baselines/reference/node10IsNode_node.errors.txt
index c04ca1cadcb61..afc5dad7f74f2 100644
--- a/tests/baselines/reference/node10IsNode_node.errors.txt
+++ b/tests/baselines/reference/node10IsNode_node.errors.txt
@@ -1,7 +1,9 @@
 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 '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.
 ==== /node_modules/fancy-lib/package.json (0 errors) ====
     {
         "name": "fancy-lib",
diff --git a/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt b/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt
index 4cb493c094bda..d162fe8e327d6 100644
--- a/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt
+++ b/tests/baselines/reference/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt
@@ -1,10 +1,12 @@
 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=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 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=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.
 ==== index.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
index 984cb20e7a2e5..2576b70838980 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_classic.errors.txt
@@ -1,28 +1,19 @@
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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(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.
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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.
 
 
-<<<<<<< HEAD
-==== root/tsconfig.json (2 errors) ====
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-==== root/tsconfig.json (3 errors) ====
-=======
 ==== root/tsconfig.json (4 errors) ====
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     {
         "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
             "paths": {
                 "*1*": [ "*2*" ]
                 ~~~~~
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt
index 3f4b7a24edf25..9bf5684ae2246 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution2_node.errors.txt
@@ -1,11 +1,16 @@
+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 (2 errors) ====
+==== root/tsconfig.json (3 errors) ====
     {
         "compilerOptions": {
             "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
             "paths": {
                 "*1*": [ "*2*" ]
                 ~~~~~
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types
index 9dd70eaa6a659..f2218da4c56a8 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_classic.types
@@ -9,6 +9,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.errors.txt
new file mode 100644
index 0000000000000..d9ca06c604d8f
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.errors.txt
@@ -0,0 +1,21 @@
+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 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.
+==== c:/root/folder1/file1.ts (0 errors) ====
+    import {x} from "folder2/file2"
+    declare function use(a: any): void;
+    use(x.toExponential());
+    
+==== c:/root/folder2/file2.ts (0 errors) ====
+    import {x as a} from "./file3"  // found with baseurl
+    import {y as b} from "file4"    // found with fallback
+    export var x = a + b;
+    
+==== c:/root/folder2/file3.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/node_modules/file4/index.d.ts (0 errors) ====
+    export var y: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types
index 33456a972a9db..380f5c4d635bb 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution3_node.types
@@ -9,6 +9,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types
index 48feb81a3a3ef..8d0f66acef6a4 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_classic.types
@@ -9,6 +9,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.errors.txt
new file mode 100644
index 0000000000000..775285c2751d1
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.errors.txt
@@ -0,0 +1,29 @@
+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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": "."
+            ~~~~~~~~~
+!!! 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.
+        }
+    }
+    
+==== c:/root/folder1/file1.ts (0 errors) ====
+    import {x} from "folder2/file2"
+    declare function use(a: any): void;
+    use(x.toExponential());
+    
+==== c:/root/folder2/file2.ts (0 errors) ====
+    import {x as a} from "./file3"  // found with baseurl
+    import {y as b} from "file4"    // found with fallback
+    export var x = a + b;
+    
+==== c:/root/folder2/file3.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/node_modules/file4/index.d.ts (0 errors) ====
+    export var y: number;
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types
index ca6e3d690b0e2..2a73f2d6c321d 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution4_node.types
@@ -9,6 +9,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types
index e9296ecf3f3d9..74d04563de98f 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_classic.types
@@ -21,6 +21,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.errors.txt
new file mode 100644
index 0000000000000..36ef96f68e118
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.errors.txt
@@ -0,0 +1,47 @@
+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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+                "paths": {
+                "*": [
+                    "*",
+                    "generated/*"
+                ],
+                    "components/*": [
+                        "shared/components/*"
+                    ]
+            }
+        }
+    }
+==== c:/root/folder1/file1.ts (0 errors) ====
+    import {x} from "folder2/file1"
+    import {y} from "folder3/file2"
+    import {z} from "components/file3"
+    import {z1} from "file4"
+    
+    declare function use(a: any): void;
+    
+    use(x.toExponential());
+    use(y.toExponential());
+    use(z.toExponential());
+    use(z1.toExponential());
+    
+==== c:/root/folder2/file1.ts (0 errors) ====
+    export var x = 1;
+    
+==== c:/root/generated/folder3/file2.ts (0 errors) ====
+    export var y = 1;
+    
+==== c:/root/shared/components/file3/index.d.ts (0 errors) ====
+    export var z: number;
+    
+==== c:/node_modules/file4.ts (0 errors) ====
+    export var z1 = 1;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types
index ce53f71e8d777..ca7f9c11dcaa8 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution5_node.types
@@ -21,6 +21,7 @@ declare function use(a: any): void;
 >use : (a: any) => void
 >    : ^ ^^   ^^^^^    
 >a : any
+>  : ^^^
 
 use(x.toExponential());
 >use(x.toExponential()) : void
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types
index fa6254e61aafb..2914e4a839386 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_classic.types
@@ -17,6 +17,7 @@ declare function use(x: string);
 
 use(x.toFixed());
 >use(x.toFixed()) : any
+>                 : ^^^
 >use : (x: string) => any
 >    : ^ ^^      ^^^^^^^^
 >x.toFixed() : string
@@ -30,6 +31,7 @@ use(x.toFixed());
 
 use(y.toFixed());
 >use(y.toFixed()) : any
+>                 : ^^^
 >use : (x: string) => any
 >    : ^ ^^      ^^^^^^^^
 >y.toFixed() : string
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.errors.txt
new file mode 100644
index 0000000000000..cdfe1c094e96c
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.errors.txt
@@ -0,0 +1,54 @@
+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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": "../",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": [
+                    "*",
+                    "c:/shared/*"
+                ],
+                "templates/*": [
+                    "generated/src/templates/*"
+                ]
+            },
+            "rootDirs": [
+                ".",
+                "../generated/src"
+            ]
+        }
+    }
+    
+==== c:/root/src/file1.ts (0 errors) ====
+    import {x} from "./project/file2";
+    import {y} from "module3";
+    
+    declare function use(x: string);
+    use(x.toFixed());
+    use(y.toFixed());
+    
+==== c:/root/src/file3/index.d.ts (0 errors) ====
+    export let x: number;
+    
+==== c:/root/generated/src/project/file2.ts (0 errors) ====
+    import {a} from "module1";
+    import {b} from "templates/module2";
+    import {x as c} from "../file3";
+    export let x = a + b + c;
+    
+==== c:/shared/module1/index.d.ts (0 errors) ====
+    export let a: number
+    
+==== c:/root/generated/src/templates/module2.ts (0 errors) ====
+    export let b: number;
+    
+==== c:/node_modules/module3.d.ts (0 errors) ====
+    export let y: number;
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types
index 476d6bc06ae38..280dca8a6a642 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution7_node.types
@@ -17,6 +17,7 @@ declare function use(x: string);
 
 use(x.toFixed());
 >use(x.toFixed()) : any
+>                 : ^^^
 >use : (x: string) => any
 >    : ^ ^^      ^^^^^^^^
 >x.toFixed() : string
@@ -30,6 +31,7 @@ use(x.toFixed());
 
 use(y.toFixed());
 >use(y.toFixed()) : any
+>                 : ^^^
 >use : (x: string) => any
 >    : ^ ^^      ^^^^^^^^
 >y.toFixed() : string
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution8_node.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution8_node.errors.txt
new file mode 100644
index 0000000000000..d5b374cce184c
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution8_node.errors.txt
@@ -0,0 +1,25 @@
+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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "@speedy/*/testing": [
+                   "*/dist/index.ts"
+                ]
+            }
+        }
+    }
+    
+==== c:/root/index.ts (0 errors) ====
+    import {x} from "@speedy/folder1/testing"
+    
+==== c:/root/folder1/dist/index.ts (0 errors) ====
+    export const x = 1 + 2;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt
new file mode 100644
index 0000000000000..e9ee39e9edb06
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt
@@ -0,0 +1,29 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "/*": ["./src/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/src/foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /root/src/bar.js (0 errors) ====
+    export function bar() {}
+    
+==== /root/a.ts (0 errors) ====
+    import { foo } from "/foo";
+    import { bar } from "/bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt
new file mode 100644
index 0000000000000..35193e23dbe44
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt
@@ -0,0 +1,53 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "/*": ["./src/*"],
+                "c:/*": ["./src/*"],
+                "c:\\*": ["./src/*"],
+                "//server/*": ["./src/*"],
+                "\\\\server\\*": ["./src/*"],
+                "file:///*": ["./src/*"],
+                "file://c:/*": ["./src/*"],
+                "file://server/*": ["./src/*"],
+                "http://server/*": ["./src/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/src/foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /root/src/bar.js (0 errors) ====
+    export function bar() {}
+    
+==== /root/a.ts (0 errors) ====
+    import { foo as foo1 } from "/foo";
+    import { bar as bar1 } from "/bar";
+    import { foo as foo2 } from "c:/foo";
+    import { bar as bar2 } from "c:/bar";
+    import { foo as foo3 } from "c:\\foo";
+    import { bar as bar3 } from "c:\\bar";
+    import { foo as foo4 } from "//server/foo";
+    import { bar as bar4 } from "//server/bar";
+    import { foo as foo5 } from "\\\\server\\foo";
+    import { bar as bar5 } from "\\\\server\\bar";
+    import { foo as foo6 } from "file:///foo";
+    import { bar as bar6 } from "file:///bar";
+    import { foo as foo7 } from "file://c:/foo";
+    import { bar as bar7 } from "file://c:/bar";
+    import { foo as foo8 } from "file://server/foo";
+    import { bar as bar8 } from "file://server/bar";
+    import { foo as foo9 } from "http://server/foo";
+    import { bar as bar9 } from "http://server/bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt
new file mode 100644
index 0000000000000..360d70103cc2a
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt
@@ -0,0 +1,30 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "/client/*": ["./client/*"],
+                "/import/*": ["./import/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/import/foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /root/client/bar.js (0 errors) ====
+    export function bar() {}
+    
+==== /root/src/a.ts (0 errors) ====
+    import { foo } from "/import/foo";
+    import { bar } from "/client/bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
new file mode 100644
index 0000000000000..b1c065299a09f
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt
@@ -0,0 +1,29 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "/*": ["./src/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/a.ts (0 errors) ====
+    import { foo } from "/foo";
+    import { bar } from "/bar";
+    
+==== /foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /bar.js (0 errors) ====
+    export function bar() {}
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt
new file mode 100644
index 0000000000000..e1c6280515dda
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt
@@ -0,0 +1,29 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": ["./src/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/src/foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /root/src/bar.js (0 errors) ====
+    export function bar() {}
+    
+==== /root/a.ts (0 errors) ====
+    import { foo } from "/foo";
+    import { bar } from "/bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
new file mode 100644
index 0000000000000..dd15993906e4e
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt
@@ -0,0 +1,29 @@
+/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 (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": ["./src/*"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /root/a.ts (0 errors) ====
+    import { foo } from "/foo";
+    import { bar } from "/bar";
+    
+==== /foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /bar.js (0 errors) ====
+    export function bar() {}
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.errors.txt
new file mode 100644
index 0000000000000..341bdec92c8b6
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension.errors.txt
@@ -0,0 +1,30 @@
+/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.
+
+
+==== /tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "foo": ["foo/foo.ts"],
+                "bar": ["bar/bar.js"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /foo/foo.ts (0 errors) ====
+    export function foo() {}
+    
+==== /bar/bar.js (0 errors) ====
+    export function bar() {}
+    
+==== /a.ts (0 errors) ====
+    import { foo } from "foo";
+    import { bar } from "bar";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtensionInName.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtensionInName.errors.txt
new file mode 100644
index 0000000000000..d3de848b54ed2
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtensionInName.errors.txt
@@ -0,0 +1,27 @@
+/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.
+
+
+==== /tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": ["foo/*"]
+            }
+        }
+    }
+    
+==== /foo/zone.js/index.d.ts (0 errors) ====
+    export const x: number;
+    
+==== /foo/zone.tsx/index.d.ts (0 errors) ====
+    export const y: number;
+    
+==== /a.ts (0 errors) ====
+    import { x } from "zone.js";
+    import { y } from "zone.tsx";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt
new file mode 100644
index 0000000000000..2cd07bd7d6816
--- /dev/null
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt
@@ -0,0 +1,25 @@
+/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.
+
+
+==== /tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": ["node_modules/*", "src/types"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /a.ts (0 errors) ====
+    import foobar from "foo/bar/foobar.js";
+    
+==== /node_modules/foo/bar/foobar.js (0 errors) ====
+    module.exports = { a: 10 };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
index 5bbf4b220f7d1..621bb254290a6 100644
--- a/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
+++ b/tests/baselines/reference/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt
@@ -1,10 +1,15 @@
+/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.
 /a.ts(1,21): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
 
 
-==== /tsconfig.json (0 errors) ====
+==== /tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
             "paths": {
                 "foo": ["foo/foo.ts"]
             }
diff --git a/tests/baselines/reference/pathMappingInheritedBaseUrl.errors.txt b/tests/baselines/reference/pathMappingInheritedBaseUrl.errors.txt
new file mode 100644
index 0000000000000..700ac66fcca9c
--- /dev/null
+++ b/tests/baselines/reference/pathMappingInheritedBaseUrl.errors.txt
@@ -0,0 +1,31 @@
+/project/tsconfig.json(3,3): 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.
+
+
+==== /project/tsconfig.json (1 errors) ====
+    {
+      "extends": "../other/tsconfig.base.json",
+      "compilerOptions": {
+      ~~~~~~~~~~~~~~~~~
+!!! 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.
+        "module": "commonjs",
+        "paths": {
+          "p1": ["./lib/p1"]
+        }
+      }
+    }
+    
+==== /project/index.ts (0 errors) ====
+    import { p1 } from "p1";
+    
+==== /other/tsconfig.base.json (0 errors) ====
+    {
+      "compilerOptions": {
+        "baseUrl": "."
+      }
+    }
+    
+==== /other/lib/p1/index.ts (0 errors) ====
+    export const p1 = 0;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/pathsValidation1.errors.txt b/tests/baselines/reference/pathsValidation1.errors.txt
index 2c6784d00d715..3d6ff41d7e009 100644
--- a/tests/baselines/reference/pathsValidation1.errors.txt
+++ b/tests/baselines/reference/pathsValidation1.errors.txt
@@ -1,10 +1,15 @@
+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.
 tsconfig.json(5,18): error TS5063: Substitutions for pattern '*' should be an array.
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
             "paths": {
                 "*": "*"
                      ~~~
diff --git a/tests/baselines/reference/pathsValidation2.errors.txt b/tests/baselines/reference/pathsValidation2.errors.txt
index 65391139631e9..deab5ab9c2209 100644
--- a/tests/baselines/reference/pathsValidation2.errors.txt
+++ b/tests/baselines/reference/pathsValidation2.errors.txt
@@ -1,10 +1,15 @@
+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.
 tsconfig.json(5,19): error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'.
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
             "paths": {
                 "*": [1]
                       ~
diff --git a/tests/baselines/reference/pathsValidation3.errors.txt b/tests/baselines/reference/pathsValidation3.errors.txt
index fd7f026ca1443..ba5ebd225da61 100644
--- a/tests/baselines/reference/pathsValidation3.errors.txt
+++ b/tests/baselines/reference/pathsValidation3.errors.txt
@@ -1,10 +1,15 @@
+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.
 tsconfig.json(5,20): error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array.
 
 
-==== tsconfig.json (1 errors) ====
+==== tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
             "paths": {
                 "foo": []
                        ~~
diff --git a/tests/baselines/reference/pathsValidation4.errors.txt b/tests/baselines/reference/pathsValidation4.errors.txt
index 386079a29503b..352b9a80d7af4 100644
--- a/tests/baselines/reference/pathsValidation4.errors.txt
+++ b/tests/baselines/reference/pathsValidation4.errors.txt
@@ -1,13 +1,18 @@
+tsconfig.json(4,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.
 tsconfig.json(6,11): error TS5061: Pattern '@interface/**/*' can have at most one '*' character.
 tsconfig.json(7,11): error TS5061: Pattern '@service/**/*' can have at most one '*' character.
 tsconfig.json(7,29): error TS5062: Substitution './src/service/**/*' in pattern '@service/**/*' can have at most one '*' character.
 
 
-==== tsconfig.json (3 errors) ====
+==== tsconfig.json (4 errors) ====
     {
         "compilerOptions": {
             "traceResolution": true,
             "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.
+!!! error TS5101:   Visit https://aka.ms/ts6 for migration information.
             "paths": {
               "@interface/**/*" : ["./src/interface/*"],
               ~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
index 2db8c409f81c0..e4d27b5054bc1 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.errors.txt
@@ -6,13 +6,13 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     export var x = 1;  // Makes this an external module 
     interface Iterator<T> { x: T }
     
-    namespace Q {
+    module Q {
         export function foo<T>(x: (a: Iterator<T>) => number) {
             return x;
         }
     }
     
-    namespace Q {
+    module Q {
         function bar() {
             foo(null);
         }
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
index 89511809e6112..a731f0fded1d1 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.errors.txt
@@ -12,7 +12,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         return undefined;
     }
     
-    namespace Foo {
+    module Foo {
         export var x = "hello";
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGetter.errors.txt b/tests/baselines/reference/privacyGetter.errors.txt
index e8b11e2d53e4b..aac49281ef928 100644
--- a/tests/baselines/reference/privacyGetter.errors.txt
+++ b/tests/baselines/reference/privacyGetter.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module m1 {
         export class C1_public {
             private f1() {
             }
@@ -73,7 +73,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         }
     }
     
-    namespace m2 {
+    module m2 {
         export class m2_C1_public {
             private f1() {
             }
diff --git a/tests/baselines/reference/privacyGloFunc.errors.txt b/tests/baselines/reference/privacyGloFunc.errors.txt
index 0a8e3f15038f0..f5e4ed9e643c7 100644
--- a/tests/baselines/reference/privacyGloFunc.errors.txt
+++ b/tests/baselines/reference/privacyGloFunc.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module m1 {
         export class C1_public {
             private f1() {
             }
@@ -181,7 +181,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         }
     }
     
-    namespace m2 {
+    module m2 {
         export class m2_C1_public {
             private f() {
             }
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
index f4b5c64768dd3..4af6daf69184f 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module m_private {
         export class c_private {
         }
         export enum e_private {
@@ -17,18 +17,18 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_private = new c_private();
         export interface i_private {
         }
-        export namespace mi_private {
+        export module mi_private {
             export class c {
             }
         }
-        export namespace mu_private {
+        export module mu_private {
             export interface i {
             }
         }
     }
     
     // Public elements
-    export namespace m_public {
+    export module m_public {
         export class c_public {
         }
         export enum e_public {
@@ -41,17 +41,17 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_public = 10;
         export interface i_public {
         }
-        export namespace mi_public {
+        export module mi_public {
             export class c {
             }
         }
-        export namespace mu_public {
+        export module mu_public {
             export interface i {
             }
         }
     }
     
-    export namespace import_public {
+    export module 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;
@@ -104,7 +104,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var publicUse_im_private_mu_public: im_private_mu_public.i;
     }
     
-    namespace import_private {
+    module 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;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index 20d5caa569ca6..0f3df7475c600 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -50,74 +50,20 @@ export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.c_public = void 0;
-    // Public elements
-    class c_public {
-    }
-    exports.c_public = c_public;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "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;
-}());
+class c_public {
+}
 exports.c_public = c_public;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.c_public = void 0;
-    class c_public {
-    }
-    exports.c_public = c_public;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.c_public = void 0;
-var c_public = /** @class */ (function () {
-    function c_public() {
-    }
-    return c_public;
-}());
+class c_public {
+}
 exports.c_public = c_public;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
index 1569b84214a0a..6fa03c4b1c8f7 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module m_private {
         export class c_private {
         }
         export enum e_private {
@@ -17,18 +17,18 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_private = new c_private();
         export interface i_private {
         }
-        export namespace mi_private {
+        export module mi_private {
             export class c {
             }
         }
-        export namespace mu_private {
+        export module mu_private {
             export interface i {
             }
         }
     }
     
     // Public elements
-    export namespace m_public {
+    export module m_public {
         export class c_public {
         }
         export enum e_public {
@@ -41,11 +41,11 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_public = 10;
         export interface i_public {
         }
-        export namespace mi_public {
+        export module mi_public {
             export class c {
             }
         }
-        export namespace mu_public {
+        export module mu_public {
             export interface i {
             }
         }
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
index 39a66f745261a..728f9ef2e50e3 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
@@ -4,7 +4,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 !!! 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 {
+    module m_private {
         export class c_private {
         }
         export enum e_private {
@@ -17,18 +17,18 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_private = new c_private();
         export interface i_private {
         }
-        export namespace mi_private {
+        export module mi_private {
             export class c {
             }
         }
-        export namespace mu_private {
+        export module mu_private {
             export interface i {
             }
         }
     }
     
     // Public elements
-    export namespace m_public {
+    export module m_public {
         export class c_public {
         }
         export enum e_public {
@@ -41,11 +41,11 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         export var v_public = 10;
         export interface i_public {
         }
-        export namespace mi_public {
+        export module mi_public {
             export class c {
             }
         }
-        export namespace mu_public {
+        export module mu_public {
             export interface i {
             }
         }
diff --git a/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt b/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
index 3590de718d749..5d8e6b6e6bfe0 100644
--- a/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
+++ b/tests/baselines/reference/project/baseline3/amd/baseline3.errors.txt
@@ -5,8 +5,8 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    export module outer {
+    	export module inner {
     		var local = 1;
     		export var a = local;
     	}
diff --git a/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt b/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
index 3fa1f12ca1258..9f4ea9300c863 100644
--- a/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
+++ b/tests/baselines/reference/project/baseline3/node/baseline3.errors.txt
@@ -3,8 +3,8 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    export module outer {
+    	export module inner {
     		var local = 1;
     		export var a = local;
     	}
diff --git a/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
index 833478d927747..531f35ce8cc2e 100644
--- a/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
+++ b/tests/baselines/reference/project/declarationsExportNamespace/amd/declarationsExportNamespace.errors.txt
@@ -10,7 +10,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     }
     export as namespace moduleA;
 ==== useModule.ts (0 errors) ====
-    namespace moduleB {
+    module moduleB {
         export interface IUseModuleA {
             a: moduleA.A;
         }
diff --git a/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
index f6e1a7f7645d0..046be3577d207 100644
--- a/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
+++ b/tests/baselines/reference/project/declarationsExportNamespace/node/declarationsExportNamespace.errors.txt
@@ -8,7 +8,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     }
     export as namespace moduleA;
 ==== useModule.ts (0 errors) ====
-    namespace moduleB {
+    module moduleB {
         export interface IUseModuleA {
             a: moduleA.A;
         }
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
index 5a2867d36b6fe..ba4203a99052b 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/declarationsImportedInPrivate.errors.txt
@@ -17,7 +17,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 ==== useModule.ts (0 errors) ====
     // only used privately no need to emit
     import private_m4 = require("private_m4");
-    export namespace usePrivate_m4_m1 {
+    export module usePrivate_m4_m1 {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
index 1cab1c03a3e64..cdb65a3d93662 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/declarationsImportedInPrivate.errors.txt
@@ -15,7 +15,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 ==== useModule.ts (0 errors) ====
     // only used privately no need to emit
     import private_m4 = require("private_m4");
-    export namespace usePrivate_m4_m1 {
+    export module usePrivate_m4_m1 {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
index 2e320cff19d44..16c5346b90e3b 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/declarationsMultipleTimesImport.errors.txt
@@ -18,7 +18,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
index adbf74ce77c1f..c998ea2814973 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/declarationsMultipleTimesImport.errors.txt
@@ -16,7 +16,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
index f1d13f19b4505..d4671cbb2d84a 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/declarationsMultipleTimesMultipleImport.errors.txt
@@ -23,7 +23,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
index 9fd68a4c43ccf..6736fd3889a29 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/declarationsMultipleTimesMultipleImport.errors.txt
@@ -21,7 +21,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
index 1d0efa7d14624..36e24bcba9fd5 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/declarationsSimpleImport.errors.txt
@@ -18,7 +18,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
index d32645887060c..9d422bd692286 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/declarationsSimpleImport.errors.txt
@@ -16,7 +16,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     export var d4 = m4.d;
     export var f4 = m4.foo();
     
-    export namespace m1 {
+    export module m1 {
         export var x2 = m4.x;
         export var d2 = m4.d;
         export var f2 = m4.foo();
diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
index e386dc0900383..ede7e72d6eb9a 100644
--- a/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/extReferencingExtAndInt/amd/extReferencingExtAndInt.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    module outer {
     	export var b = "foo";
     }
 ==== external2.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
index dcef28814220e..d7612e78e15c1 100644
--- a/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
+++ b/tests/baselines/reference/project/extReferencingExtAndInt/node/extReferencingExtAndInt.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    module outer {
     	export var b = "foo";
     }
 ==== external2.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
index d6da6659accad..ceae681db903d 100644
--- a/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
+++ b/tests/baselines/reference/project/moduleMergingOrdering1/amd/moduleMergingOrdering1.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    module Test {
         class A {
             one: string;
             two: boolean;
@@ -24,6 +24,6 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     }
     
 ==== b.ts (0 errors) ====
-    namespace Test {}
+    module 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
index b25a7ac2aa141..a4eb03569a46c 100644
--- a/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
+++ b/tests/baselines/reference/project/moduleMergingOrdering1/node/moduleMergingOrdering1.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    module Test {
         class A {
             one: string;
             two: boolean;
@@ -22,6 +22,6 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     }
     
 ==== b.ts (0 errors) ====
-    namespace Test {}
+    module 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
index 31066548247b1..68ef186be5e2d 100644
--- a/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
+++ b/tests/baselines/reference/project/moduleMergingOrdering2/amd/moduleMergingOrdering2.errors.txt
@@ -5,11 +5,11 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {}
+    module Test {}
     
     
 ==== a.ts (0 errors) ====
-    namespace Test {
+    module Test {
         class A {
             one: string;
             two: boolean;
diff --git a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
index 574a78301e6fa..c56d10bb1d909 100644
--- a/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
+++ b/tests/baselines/reference/project/moduleMergingOrdering2/node/moduleMergingOrdering2.errors.txt
@@ -3,11 +3,11 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {}
+    module Test {}
     
     
 ==== a.ts (0 errors) ====
-    namespace Test {
+    module Test {
         class A {
             one: string;
             two: boolean;
diff --git a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
index 9699825d7f176..74118e5bd57af 100644
--- a/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
+++ b/tests/baselines/reference/project/nestedReferenceTags/amd/nestedReferenceTags.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    module test {
         export class ClassA
         {
             public method() { }
@@ -14,7 +14,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 ==== lib/classB.ts (0 errors) ====
     /// <reference path="classA.ts" />
     
-    namespace test {
+    module test {
         export class ClassB extends ClassA 
         {
         }
diff --git a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
index 19feb3cc3e42b..961f401a4d601 100644
--- a/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
+++ b/tests/baselines/reference/project/nestedReferenceTags/node/nestedReferenceTags.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    module test {
         export class ClassA
         {
             public method() { }
@@ -12,7 +12,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 ==== lib/classB.ts (0 errors) ====
     /// <reference path="classA.ts" />
     
-    namespace test {
+    module test {
         export class ClassB extends ClassA 
         {
         }
diff --git a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
index 97f87b40349d8..0f72ca9a1af6c 100644
--- a/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
+++ b/tests/baselines/reference/project/noDefaultLib/amd/noDefaultLib.errors.txt
@@ -6,6 +6,8 @@ error TS2318: Cannot find global type 'Number'.
 error TS2318: Cannot find global type 'Object'.
 error TS2318: Cannot find global type 'RegExp'.
 error TS2318: Cannot find global 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.
+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(3,8): error TS2304: Cannot find name 'Array'.
 
 
@@ -17,6 +19,8 @@ test.ts(3,8): error TS2304: Cannot find name 'Array'.
 !!! error TS2318: Cannot find global type 'Object'.
 !!! error TS2318: Cannot find global type 'RegExp'.
 !!! error TS2318: Cannot find global 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.
+!!! 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 (1 errors) ====
     /// <reference no-default-lib="true"/>
     
diff --git a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
index 97f87b40349d8..3cc7419a83c96 100644
--- a/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
+++ b/tests/baselines/reference/project/noDefaultLib/node/noDefaultLib.errors.txt
@@ -6,6 +6,7 @@ error TS2318: Cannot find global type 'Number'.
 error TS2318: Cannot find global type 'Object'.
 error TS2318: Cannot find global type 'RegExp'.
 error TS2318: Cannot find global type 'String'.
+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(3,8): error TS2304: Cannot find name 'Array'.
 
 
@@ -17,6 +18,7 @@ test.ts(3,8): error TS2304: Cannot find name 'Array'.
 !!! error TS2318: Cannot find global type 'Object'.
 !!! error TS2318: Cannot find global type 'RegExp'.
 !!! error TS2318: Cannot find global type 'String'.
+!!! 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 (1 errors) ====
     /// <reference no-default-lib="true"/>
     
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
index f4722e4d33184..d28c30fc98b5d 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/nodeModulesImportHigher.errors.txt
@@ -1,5 +1,6 @@
 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'.
 
 
@@ -13,6 +14,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
         "moduleResolution": "node",
                             ~~~~~~
 !!! 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.
         "maxNodeModuleJsDepth": 2
       }
     }
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
index 774e8b8dfdd99..15ab81a78c641 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/nodeModulesImportHigher.errors.txt
@@ -1,4 +1,5 @@
 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'.
 
 
@@ -10,6 +11,7 @@ importHigher/root.ts(6,1): error TS2322: Type 'string' is not assignable to type
         "moduleResolution": "node",
                             ~~~~~~
 !!! 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.
         "maxNodeModuleJsDepth": 2
       }
     }
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
index 9178559f9020d..036cc2483f702 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,5 +1,6 @@
 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.
 
@@ -11,6 +12,7 @@ maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it i
 !!! error TS5107: Option 'module=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,
         "maxNodeModuleJsDepth": 1, // Note: Module m1 is already included as a root file
         "outDir": "built"
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
index c31f3e8f802dd..4a8a36a59473f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/nodeModulesMaxDepthExceeded.errors.txt
@@ -1,4 +1,5 @@
 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.
 
@@ -8,6 +9,7 @@ maxDepthExceeded/root.ts(4,4): error TS2540: Cannot assign to 'rel' because it i
       "compilerOptions": { 
       ~~~~~~~~~~~~~~~~~
 !!! 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,
         "maxNodeModuleJsDepth": 1, // Note: Module m1 is already included as a root file
         "outDir": "built"
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
index 489fa514a91a4..46150dd416ccf 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,5 +1,6 @@
 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'.
 
 
@@ -10,6 +11,7 @@ maxDepthIncreased/root.ts(7,1): error TS2322: Type 'string' is not assignable to
 !!! error TS5107: Option 'module=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,
         "maxNodeModuleJsDepth": 3
       }
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
index 7bee0e796e93e..00f98e5a0fbbc 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/nodeModulesMaxDepthIncreased.errors.txt
@@ -1,4 +1,5 @@
 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'.
 
 
@@ -7,6 +8,7 @@ maxDepthIncreased/root.ts(7,1): error TS2322: Type 'string' is not assignable to
       "compilerOptions": { 
       ~~~~~~~~~~~~~~~~~
 !!! 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,
         "maxNodeModuleJsDepth": 3
       }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
index acf505d4d9ce9..0ea6bcdd8a049 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/amd/privacyCheckOnImportedModuleSimpleReference.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 module me {
         export class class1 {
             public prop1 = 0;
         }
@@ -16,7 +16,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
         }
     }
 ==== mNonExported.ts (0 errors) ====
-    export namespace mne {
+    export module mne {
         export class class1 {
             public prop1 = 0;
         }
diff --git a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
index 9bd26355c3d90..6b3b36b342096 100644
--- a/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
+++ b/tests/baselines/reference/project/privacyCheckOnImportedModuleSimpleReference/node/privacyCheckOnImportedModuleSimpleReference.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 module me {
         export class class1 {
             public prop1 = 0;
         }
@@ -14,7 +14,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
         }
     }
 ==== mNonExported.ts (0 errors) ====
-    export namespace mne {
+    export module mne {
         export class class1 {
             public prop1 = 0;
         }
diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
index b8f55915d4f74..851209d9526a1 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
@@ -10,7 +10,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     
 ==== __extends.ts (0 errors) ====
     // class inheritance to ensure __extends is emitted
-    namespace m {
+    module m {
         export class base {}
         export class child extends base {}
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
index a01bffd6f0550..f2d58fc0f627e 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/quotesInFileAndDirectoryNames.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    module test {
         export class ClassA
         {
             public method() { }
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
index 07a8aa4633c4e..4f532554a93c1 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/quotesInFileAndDirectoryNames.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    module test {
         export class ClassA
         {
             public method() { }
diff --git a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
index d7e28101b9377..536abc9ab892f 100644
--- a/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
+++ b/tests/baselines/reference/project/referencePathStatic/amd/referencePathStatic.errors.txt
@@ -5,7 +5,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 !!! error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 !!! 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 {
+    module Lib {
         export class LibType {}
     }
     
diff --git a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
index 10a5b21a8f645..9532468548c39 100644
--- a/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
+++ b/tests/baselines/reference/project/referencePathStatic/node/referencePathStatic.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
 
 !!! 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 {
+    module Lib {
         export class LibType {}
     }
     
diff --git a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
index ae1512786d8a4..f1610effb7afb 100644
--- a/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
+++ b/tests/baselines/reference/propertyIdentityWithPrivacyMismatch.js
@@ -29,53 +29,13 @@ var y: Foo2;
 
 //// [propertyIdentityWithPrivacyMismatch_0.js]
 //// [propertyIdentityWithPrivacyMismatch_1.js]
-<<<<<<< HEAD
-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)
-    class Foo1 {
-    }
-    class Foo2 {
-    }
-    var y;
-    var y;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "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;
-}());
+class Foo1 {
+}
+class Foo2 {
+}
 var y;
 var y;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index ad200057d11fd..dd5d73bf8e3a6 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -17,26 +17,9 @@ import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index 5c66c033a1acf..da8291096732d 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -21,26 +21,9 @@ import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index 042f042401b6c..97fd3d553811b 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -25,26 +25,9 @@ import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"
 export var b: ClassB; // This should result in type ClassB
 
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 54cdef2643325..3d9263cd6613a 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -18,26 +18,9 @@ export var b: ClassB; // This should result in type ClassB
 var self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC");
 module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 0fd97a6b80c88..98d34d521ba92 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -26,26 +26,9 @@ module.exports = self;
 var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD");
 module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index c591291cb7a0b..2d7f3adff34b8 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -34,26 +34,9 @@ module.exports = self;
 var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD");
 module.exports = self;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index c53c278a53508..dc7f8bb433339 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -36,26 +36,9 @@ var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD");
 var selfVar = self;
 module.exports = selfVar;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    class ClassB {
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    var ClassB = /** @class */ (function () {
-        function ClassB() {
-        }
-        return ClassB;
-    }());
-=======
 "use strict";
-var ClassB = /** @class */ (function () {
-    function ClassB() {
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    }
-    return ClassB;
-}());
+class ClassB {
+}
 module.exports = ClassB;
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 "use strict";
diff --git a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
index 61d4d95b60bdd..5c405bc794a43 100644
--- a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
+++ b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt
@@ -12,12 +12,12 @@ error TS5107: Option 'moduleResolution=classic' is deprecated and will stop func
     }
     
 ==== test/foo.d.ts (0 errors) ====
-    export declare namespace M2 {
+    export declare module M2 {
     	export var x: boolean;
     }
     
 ==== test/other.d.ts (0 errors) ====
-    export declare namespace M2 {
+    export declare module M2 {
     	export var x: string;
     }
     
diff --git a/tests/baselines/reference/requireEmitSemicolon.errors.txt b/tests/baselines/reference/requireEmitSemicolon.errors.txt
index ee48ee9b36f1a..908f912ec021b 100644
--- a/tests/baselines/reference/requireEmitSemicolon.errors.txt
+++ b/tests/baselines/reference/requireEmitSemicolon.errors.txt
@@ -6,7 +6,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     ///<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 module Database {
     	export class DB {
     	    public findPerson(id: number): P.Models.Person {
     	        return new P.Models.Person("Rock");
@@ -14,7 +14,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     	}
     } 
 ==== requireEmitSemicolon_0.ts (0 errors) ====
-    export namespace Models {
+    export module Models {
     	export class Person {
             constructor(name: string) { }
     	}
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt b/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
index de95af399d5b3..fa091969efa9b 100644
--- a/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt
@@ -1,10 +1,15 @@
+/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.
 /a.ts(1,20): error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 
-==== /tsconfig.json (0 errors) ====
+==== /tsconfig.json (1 errors) ====
     {
         "compilerOptions": {
             "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
             "paths": {
                 "*": ["node_modules/*", "src/types"]
             },
diff --git a/tests/baselines/reference/requireOfJsonFile_PathMapping.errors.txt b/tests/baselines/reference/requireOfJsonFile_PathMapping.errors.txt
new file mode 100644
index 0000000000000..dcaacc9e451bd
--- /dev/null
+++ b/tests/baselines/reference/requireOfJsonFile_PathMapping.errors.txt
@@ -0,0 +1,25 @@
+/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.
+
+
+==== /tsconfig.json (1 errors) ====
+    {
+        "compilerOptions": {
+            "baseUrl": ".",
+            ~~~~~~~~~
+!!! 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.
+            "paths": {
+                "*": ["node_modules/*", "src/types"]
+            },
+            "allowJs": true,
+            "outDir": "bin"
+        }
+    }
+    
+==== /a.ts (0 errors) ====
+    import foobar from "foo/bar/foobar.json";
+    
+==== /node_modules/foo/bar/foobar.json (0 errors) ====
+    { "a": 10 }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/resolutionModeTripleSlash4.errors.txt b/tests/baselines/reference/resolutionModeTripleSlash4.errors.txt
index cba5c19bba862..5e6126a30f08c 100644
--- a/tests/baselines/reference/resolutionModeTripleSlash4.errors.txt
+++ b/tests/baselines/reference/resolutionModeTripleSlash4.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(4,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.
 /app.ts(1,23): error TS2688: Cannot find type definition file for 'foo'.
 /app.ts(2,1): error TS2304: Cannot find name 'MODULE'.
 /app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
@@ -11,6 +12,7 @@
         "moduleResolution": "node10",
                             ~~~~~~~~
 !!! 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.
         "noEmit": true,
         "types": []
       }
diff --git a/tests/baselines/reference/resolutionModeTripleSlash5.errors.txt b/tests/baselines/reference/resolutionModeTripleSlash5.errors.txt
index 213cc69e008ca..ab576280c90f8 100644
--- a/tests/baselines/reference/resolutionModeTripleSlash5.errors.txt
+++ b/tests/baselines/reference/resolutionModeTripleSlash5.errors.txt
@@ -1,4 +1,5 @@
 /tsconfig.json(4,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.
 /app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'?
 
 
@@ -9,6 +10,7 @@
         "moduleResolution": "node10",
                             ~~~~~~~~
 !!! 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.
         "noEmit": true,
         "types": []
       }
diff --git a/tests/baselines/reference/staticInstanceResolution5.js b/tests/baselines/reference/staticInstanceResolution5.js
index 19ad2c241b432..f297e0196b88f 100644
--- a/tests/baselines/reference/staticInstanceResolution5.js
+++ b/tests/baselines/reference/staticInstanceResolution5.js
@@ -17,71 +17,19 @@ function z(w3: WinJS) { }
 
 
 //// [staticInstanceResolution5_0.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.Promise = void 0;
-    class Promise {
-        static timeout(delay) {
-            return null;
-        }
-    }
-    exports.Promise = Promise;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Promise = void 0;
-var Promise = /** @class */ (function () {
-    function Promise() {
-    }
-    Promise.timeout = function (delay) {
+class Promise {
+    static timeout(delay) {
         return null;
-    };
-    return Promise;
-}());
+    }
+}
 exports.Promise = Promise;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [staticInstanceResolution5_1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    // these 3 should be errors
-    var x = (w1) => { };
-    var y = function (w2) { };
-    function z(w3) { }
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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) { }
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // these 3 should be errors
-var x = function (w1) { };
+var x = (w1) => { };
 var y = function (w2) { };
 function z(w3) { }
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/systemDefaultImportCallable.errors.txt b/tests/baselines/reference/systemDefaultImportCallable.errors.txt
index d20d06e87a1d1..191c44f1953b3 100644
--- a/tests/baselines/reference/systemDefaultImportCallable.errors.txt
+++ b/tests/baselines/reference/systemDefaultImportCallable.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
 
 !!! 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 {
+    declare module core {
         var String: {
             repeat(text: string, count: number): string;
         };
diff --git a/tests/baselines/reference/systemModule7.errors.txt b/tests/baselines/reference/systemModule7.errors.txt
index c77618db5038e..883d6b1aef98a 100644
--- a/tests/baselines/reference/systemModule7.errors.txt
+++ b/tests/baselines/reference/systemModule7.errors.txt
@@ -4,11 +4,11 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
 !!! 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 {
+    export module M {
         var x = 1;
     }
     
     // filename: nonInstantiatedModule.ts
-    export namespace M {
+    export module M {
         interface I {}
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule9.errors.txt b/tests/baselines/reference/systemModule9.errors.txt
index 7ae4b13541fca..29ce0b0a6f00f 100644
--- a/tests/baselines/reference/systemModule9.errors.txt
+++ b/tests/baselines/reference/systemModule9.errors.txt
@@ -7,14 +7,8 @@ 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?
 
 
-<<<<<<< HEAD
-==== systemModule9.ts (6 errors) ====
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-==== systemModule9.ts (7 errors) ====
-=======
 !!! 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) ====
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+==== systemModule9.ts (6 errors) ====
     import * as ns from 'file1';
                         ~~~~~~~
 !!! error TS2792: Cannot find module 'file1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option?
diff --git a/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt b/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
index 60c3e39b47409..8c463dac1d7e3 100644
--- a/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
+++ b/tests/baselines/reference/systemModuleAmbientDeclarations.errors.txt
@@ -26,5 +26,5 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
     export declare enum E {X = 1}
     
 ==== file6.ts (0 errors) ====
-    export declare namespace M { var v: number; }
+    export declare module 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
index 44711f0c3ffdc..6cf45219e3f01 100644
--- a/tests/baselines/reference/systemModuleConstEnums.errors.txt
+++ b/tests/baselines/reference/systemModuleConstEnums.errors.txt
@@ -11,6 +11,6 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
         use(M.NonTopLevelConstEnum.X);
     }
     
-    namespace M {
+    module M {
         export const enum NonTopLevelConstEnum { X }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
index 2797a6292c8f1..642972cca1b8f 100644
--- a/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
+++ b/tests/baselines/reference/systemModuleConstEnumsSeparateCompilation.errors.txt
@@ -11,6 +11,6 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
         use(M.NonTopLevelConstEnum.X);
     }
     
-    namespace M {
+    module M {
         export const enum NonTopLevelConstEnum { X }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt b/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
index 17b0e359a5544..67821530cf609 100644
--- a/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
+++ b/tests/baselines/reference/systemModuleDeclarationMerging.errors.txt
@@ -4,10 +4,10 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
 !!! 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 module F { var x; }
     
     export class C {}
-    export namespace C { var x; }
+    export module C { var x; }
     
     export enum E {}
-    export namespace E { var x; }
\ No newline at end of file
+    export module E { var x; }
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
index 9e8539c276faa..aae479df5aff6 100644
--- a/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
+++ b/tests/baselines/reference/systemModuleNonTopLevelModuleMembers.errors.txt
@@ -4,13 +4,13 @@ error TS5107: Option 'module=System' is deprecated and will stop functioning in
 !!! 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 module TopLevelModule {var v;}
     export function TopLevelFunction(): void {}
     export enum TopLevelEnum {E}
     
-    export namespace TopLevelModule2 {
+    export module TopLevelModule2 {
         export class NonTopLevelClass {}
-        export namespace NonTopLevelModule {var v;}
+        export module NonTopLevelModule {var v;}
         export function NonTopLevelFunction(): void {}
         export enum NonTopLevelEnum {E}
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/topLevelLambda4.js b/tests/baselines/reference/topLevelLambda4.js
index 0c12881929ba4..81cf5783ebc13 100644
--- a/tests/baselines/reference/topLevelLambda4.js
+++ b/tests/baselines/reference/topLevelLambda4.js
@@ -4,24 +4,4 @@
 export var x = () => this.window;
 
 //// [topLevelLambda4.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.x = void 0;
-    var x = () => this.window;
-    exports.x = x;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
-var _this = this;
-export var x = function () { return _this.window; };
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+export var x = () => this.window;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).errors.txt
index a4a90872e759e..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).errors.txt	
@@ -1,6 +1,8 @@
 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 '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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.errors.txt
index a4a90872e759e..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.errors.txt	
@@ -1,6 +1,8 @@
 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 '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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.errors.txt
index a4a90872e759e..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.errors.txt	
@@ -1,6 +1,8 @@
 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 '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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.errors.txt
index a4a90872e759e..10079f19a0439 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.errors.txt	
@@ -1,6 +1,8 @@
 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 '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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
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 7c55940f84b68..69abbac8e72aa 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,8 +1,10 @@
 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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
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 7c55940f84b68..69abbac8e72aa 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,8 +1,10 @@
 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) ====
     import * as ng from "angular2/core";declare function foo(...args: any[]);@fooexport class MyClass1 {    constructor(private _elementRef: ng.ElementRef){}}
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).errors.txt b/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).errors.txt
new file mode 100644
index 0000000000000..886c2ab8d3090
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).errors.txt	
@@ -0,0 +1,8 @@
+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 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.
+==== input.js (0 errors) ====
+    x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).oldTranspile.errors.txt b/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).oldTranspile.errors.txt
new file mode 100644
index 0000000000000..886c2ab8d3090
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl (verbatimModuleSyntax=true).oldTranspile.errors.txt	
@@ -0,0 +1,8 @@
+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 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.
+==== input.js (0 errors) ====
+    x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.errors.txt b/tests/baselines/reference/transpile/Supports setting baseUrl.errors.txt
new file mode 100644
index 0000000000000..886c2ab8d3090
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.errors.txt	
@@ -0,0 +1,8 @@
+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 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.
+==== input.js (0 errors) ====
+    x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Supports setting baseUrl.oldTranspile.errors.txt
new file mode 100644
index 0000000000000..886c2ab8d3090
--- /dev/null
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.oldTranspile.errors.txt	
@@ -0,0 +1,8 @@
+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 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.
+==== input.js (0 errors) ====
+    x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).errors.txt b/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).errors.txt
index f3eaa4ae1bc6d..1f034149e4db0 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).errors.txt	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).errors.txt	
@@ -1,6 +1,8 @@
 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 '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.
 ==== input.js (0 errors) ====
     x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).oldTranspile.errors.txt b/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).oldTranspile.errors.txt
index f3eaa4ae1bc6d..1f034149e4db0 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution (verbatimModuleSyntax=true).oldTranspile.errors.txt	
@@ -1,6 +1,8 @@
 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 '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.
 ==== input.js (0 errors) ====
     x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.errors.txt b/tests/baselines/reference/transpile/Supports setting moduleResolution.errors.txt
index f3eaa4ae1bc6d..1f034149e4db0 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.errors.txt	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.errors.txt	
@@ -1,6 +1,8 @@
 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 '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.
 ==== input.js (0 errors) ====
     x;
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Supports setting moduleResolution.oldTranspile.errors.txt
index f3eaa4ae1bc6d..1f034149e4db0 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.oldTranspile.errors.txt	
@@ -1,6 +1,8 @@
 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 '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.
 ==== input.js (0 errors) ====
     x;
\ 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 89a19e081adfb..eefef4426a9a9 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
@@ -137,13 +137,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -209,13 +203,7 @@ declare const globalConst = 10;
   "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",
-<<<<<<< HEAD
-  "size": 1112
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1072
-=======
-  "size": 1113
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1153
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -242,13 +230,7 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../lib/module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -304,13 +286,7 @@ declare const myVar = 30;
   "outSignature": "-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1162
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1122
-=======
-  "size": 1161
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1201
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
@@ -734,13 +710,7 @@ const globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -806,13 +776,7 @@ const globalConst = 10;
   "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",
-<<<<<<< HEAD
-  "size": 1126
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1086
-=======
-  "size": 1127
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1167
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
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 3e58849d1d85a..ad75125e2cfeb 100644
--- a/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
+++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/prepend-reports-deprecation-error.js
@@ -149,13 +149,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -221,13 +215,7 @@ declare const globalConst = 10;
   "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",
-<<<<<<< HEAD
-  "size": 1112
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1072
-=======
-  "size": 1113
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1153
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -745,13 +733,7 @@ const globalConst = 10;
 
 //// [/home/src/workspaces/soltion/lib/module.d.ts.map] file written with same contents
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./file0.ts","./file1.ts","./file2.ts","./global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/lib/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -817,13 +799,7 @@ const globalConst = 10;
   "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",
-<<<<<<< HEAD
-  "size": 1126
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1086
-=======
-  "size": 1127
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1167
 }
 
 //// [/home/src/workspaces/soltion/lib/module.js.map.baseline.txt]
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 eb453b201bb1d..91d562ac9c83c 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
@@ -137,13 +137,7 @@ declare const globalConst = 10;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./lib/file0.ts","./lib/file1.ts","./lib/file2.ts","./lib/global.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -210,13 +204,7 @@ declare const globalConst = 10;
   "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",
-<<<<<<< HEAD
-  "size": 1149
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1109
-=======
-  "size": 1150
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1190
 }
 
 //// [/home/src/workspaces/soltion/app/module.js.map]
@@ -243,13 +231,7 @@ declare const myVar = 30;
 //# sourceMappingURL=module.d.ts.map
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../module.d.ts","./file3.ts","./file4.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/soltion/app/module.tsbuildinfo.readable.baseline.txt]
 {
@@ -305,13 +287,7 @@ declare const myVar = 30;
   "outSignature": "-23302177839-declare module \"file3\" {\n    export const z = 30;\n}\ndeclare const myVar = 30;\n",
   "latestChangedDtsFile": "./module.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1171
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1131
-=======
-  "size": 1170
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1210
 }
 
 //// [/home/src/workspaces/soltion/module.js.map.baseline.txt]
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 d7591326c2462..32980482024f4 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
@@ -86,13 +86,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -151,13 +145,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 882
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 842
-=======
-  "size": 883
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 923
 }
 
 
@@ -241,13 +229,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -307,13 +289,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 899
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 859
-=======
-  "size": 900
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 940
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -401,13 +377,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -466,13 +436,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 882
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 842
-=======
-  "size": 883
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 923
 }
 
 
@@ -527,13 +491,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -593,13 +551,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 901
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 861
-=======
-  "size": 902
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 942
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -670,13 +622,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -737,13 +683,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 923
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 883
-=======
-  "size": 924
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 964
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -901,13 +841,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -966,13 +900,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 883
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 843
-=======
-  "size": 884
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 924
 }
 
 
@@ -1027,13 +955,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1094,13 +1016,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 925
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 965
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1239,13 +1155,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1305,13 +1215,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 906
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 866
-=======
-  "size": 907
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 947
 }
 
 
@@ -1396,13 +1300,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1462,13 +1360,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 900
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 860
-=======
-  "size": 901
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 941
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1556,13 +1448,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1621,13 +1507,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 883
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 843
-=======
-  "size": 884
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 924
 }
 
 
@@ -1682,13 +1562,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1749,13 +1623,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 925
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 965
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
diff --git a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
index d02fa80c830a6..bebae5eae9e74 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/different-options.js
@@ -101,13 +101,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -169,13 +163,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -259,13 +247,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -328,13 +310,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1199
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1159
-=======
-  "size": 1200
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1240
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -422,13 +398,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -490,13 +460,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -669,13 +633,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -739,13 +697,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1223
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1183
-=======
-  "size": 1224
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1264
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -820,13 +772,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -888,13 +834,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -1084,13 +1024,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1152,13 +1086,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1183
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1143
-=======
-  "size": 1184
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1224
 }
 
 
@@ -1294,13 +1222,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1363,13 +1285,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1206
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1166
-=======
-  "size": 1207
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1247
 }
 
 
@@ -1454,13 +1370,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1523,13 +1433,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1200
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1160
-=======
-  "size": 1201
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1241
 }
 
 //// [/home/src/workspaces/outFile.js.map]
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 953d14bca0227..afed9321d8ec4 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
@@ -118,13 +118,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -185,13 +179,7 @@ declare module "d" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 918
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 878
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -471,13 +459,7 @@ Found 3 errors.
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -538,13 +520,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 933
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 973
 }
 
 
@@ -646,13 +622,7 @@ Found 3 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -713,13 +683,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 933
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 893
-=======
-  "size": 934
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 974
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -1136,13 +1100,7 @@ Found 3 errors.
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1203,13 +1161,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 950
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 910
-=======
-  "size": 951
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 991
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
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 6bc5174660c78..81244afcd50fa 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
@@ -107,13 +107,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -176,13 +170,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1199
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1159
-=======
-  "size": 1200
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1240
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -198,13 +186,7 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -266,13 +248,7 @@ declare module "g" {
   "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",
-<<<<<<< HEAD
-  "size": 1316
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1276
-=======
-  "size": 1317
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1357
 }
 
 
@@ -453,13 +429,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -522,13 +492,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1213
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1173
-=======
-  "size": 1214
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1254
 }
 
 
@@ -619,13 +583,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -688,23 +646,11 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1214
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1174
-=======
-  "size": 1215
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1255
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -766,13 +712,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1317
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1277
-=======
-  "size": 1318
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1358
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1091,13 +1031,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1160,13 +1094,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1231
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1191
-=======
-  "size": 1232
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1272
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
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 786cbe440bf4f..3f93cc07dbed5 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
@@ -116,13 +116,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -183,13 +177,7 @@ declare module "d" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 918
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 878
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -469,13 +457,7 @@ Found 3 errors.
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -536,13 +518,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 933
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 973
 }
 
 
@@ -663,13 +639,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -730,13 +700,7 @@ declare module "d" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 953
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 913
-=======
-  "size": 954
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 994
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -903,13 +867,7 @@ Found 3 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -969,13 +927,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 926
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 886
-=======
-  "size": 927
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 967
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
@@ -1292,13 +1244,7 @@ Found 3 errors.
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1358,13 +1304,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 944
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 904
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1500,13 +1440,7 @@ Found 3 errors.
 
 //// [/home/src/workspaces/solution/project1/outFile.d.ts] file written with same contents
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1567,13 +1501,7 @@ Found 3 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 987
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 947
-=======
-  "size": 988
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1028
 }
 
 
@@ -1695,13 +1623,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1762,13 +1684,7 @@ declare module "d" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1011
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 971
-=======
-  "size": 1012
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1052
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
@@ -1956,13 +1872,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -2022,13 +1932,7 @@ declare module "d" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1006
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 966
-=======
-  "size": 1007
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1047
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts] file written with same contents
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 282a114d9a116..55a6233686f22 100644
--- a/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
+++ b/tests/baselines/reference/tsbuild/commandLine/outFile/emitDeclarationOnly-on-commandline.js
@@ -105,13 +105,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -174,13 +168,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1199
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1159
-=======
-  "size": 1200
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1240
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.d.ts]
@@ -196,13 +184,7 @@ declare module "g" {
 
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -264,13 +246,7 @@ declare module "g" {
   "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",
-<<<<<<< HEAD
-  "size": 1316
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1276
-=======
-  "size": 1317
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1357
 }
 
 
@@ -451,13 +427,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -520,339 +490,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1213
-}
-
-//// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo] file changed its modified time
-
-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
-
-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::
-
-exitCode:: ExitStatus.Success
-
-Change:: non local change
-
-Input::
-//// [/home/src/workspaces/solution/project1/src/a.ts]
-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;
-
-
-/home/src/tslibs/TS/Lib/tsc.js --b project2/src --verbose --emitDeclarationOnly
-Output::
-[HH:MM:SS AM] Projects in this build: 
-    * project1/src/tsconfig.json
-    * project2/src/tsconfig.json
-
-[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'...
-
-[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'...
-
-
-
-//// [/home/src/workspaces/solution/project1/outFile.d.ts]
-declare module "a" {
-    export const a = 10;
-    export const aaa = 10;
-}
-declare module "b" {
-    export const b = 10;
-}
-declare module "c" {
-    export const c = 10;
-}
-declare module "d" {
-    export const d = 10;
-}
-
-
-//// [/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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "./src/a.ts",
-    "./src/b.ts",
-    "./src/c.ts",
-    "./src/d.ts"
-  ],
-  "fileInfos": {
-    "../../../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "./src/a.ts": "-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;",
-    "./src/b.ts": "-6189287562-export const b = 10;const bLocal = 10;",
-    "./src/c.ts": "3248317647-import { a } from \"./a\";export const c = a;",
-    "./src/d.ts": "-19615769517-import { b } from \"./b\";export const d = b;"
-  },
-  "root": [
-    [
-      [
-        2,
-        5
-      ],
-      [
-        "./src/a.ts",
-        "./src/b.ts",
-        "./src/c.ts",
-        "./src/d.ts"
-      ]
-    ]
-  ],
-  "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",
-  "size": 1259
-}
-
-//// [/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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "../project1/outfile.d.ts",
-    "./src/e.ts",
-    "./src/f.ts",
-    "./src/g.ts"
-  ],
-  "fileInfos": {
-    "../../../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
-    "../project1/outfile.d.ts": "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",
-    "./src/e.ts": "-13789510868-export const e = 10;",
-    "./src/f.ts": "-4849089835-import { a } from \"a\"; export const f = a;",
-    "./src/g.ts": "-18341999015-import { b } from \"b\"; export const g = b;"
-  },
-  "root": [
-    [
-      [
-        3,
-        5
-      ],
-      [
-        "./src/e.ts",
-        "./src/f.ts",
-        "./src/g.ts"
-      ]
-    ]
-  ],
-  "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",
-  "size": 1341
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "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",
-  "/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
-
-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::
-
-exitCode:: ExitStatus.Success
-
-Change:: non local change
-
-Input::
-//// [/home/src/workspaces/solution/project1/src/a.ts]
-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;
-
-
-/home/src/tslibs/TS/Lib/tsc.js --b project2/src --verbose --emitDeclarationOnly
-Output::
-[HH:MM:SS AM] Projects in this build: 
-    * project1/src/tsconfig.json
-    * project2/src/tsconfig.json
-
-[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'...
-
-[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'...
-
-
-
-//// [/home/src/workspaces/solution/project1/outFile.d.ts]
-declare module "a" {
-    export const a = 10;
-    export const aaa = 10;
-}
-declare module "b" {
-    export const b = 10;
-}
-declare module "c" {
-    export const c = 10;
-}
-declare module "d" {
-    export const d = 10;
-}
-
-
-//// [/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"},"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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "./src/a.ts",
-    "./src/b.ts",
-    "./src/c.ts",
-    "./src/d.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; };",
-    "./src/a.ts": "-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;",
-    "./src/b.ts": "-6189287562-export const b = 10;const bLocal = 10;",
-    "./src/c.ts": "3248317647-import { a } from \"./a\";export const c = a;",
-    "./src/d.ts": "-19615769517-import { b } from \"./b\";export const d = b;"
-  },
-  "root": [
-    [
-      [
-        2,
-        5
-      ],
-      [
-        "./src/a.ts",
-        "./src/b.ts",
-        "./src/c.ts",
-        "./src/d.ts"
-      ]
-    ]
-  ],
-  "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",
-  "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"},"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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "../project1/outfile.d.ts",
-    "./src/e.ts",
-    "./src/f.ts",
-    "./src/g.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; };",
-    "../project1/outfile.d.ts": "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",
-    "./src/e.ts": "-13789510868-export const e = 10;",
-    "./src/f.ts": "-4849089835-import { a } from \"a\"; export const f = a;",
-    "./src/g.ts": "-18341999015-import { b } from \"b\"; export const g = b;"
-  },
-  "root": [
-    [
-      [
-        3,
-        5
-      ],
-      [
-        "./src/e.ts",
-        "./src/f.ts",
-        "./src/g.ts"
-      ]
-    ]
-  ],
-  "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",
-  "size": 1301
-=======
-  "size": 1214
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1254
 }
 
 
@@ -962,7 +600,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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -974,7 +612,7 @@ declare module "d" {
     "./src/d.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; };",
+    "../../../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
     "./src/a.ts": "-6435489413-export const a = 10;const aLocal = 10;const aa = 10;export const aaa = 10;",
     "./src/b.ts": "-6189287562-export const b = 10;const bLocal = 10;",
     "./src/c.ts": "3248317647-import { a } from \"./a\";export const c = a;",
@@ -1025,11 +663,11 @@ declare module "d" {
   "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": 1300
 }
 
 //// [/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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1041,7 +679,7 @@ declare module "d" {
     "./src/g.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; };",
+    "../../../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };",
     "../project1/outfile.d.ts": "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",
     "./src/e.ts": "-13789510868-export const e = 10;",
     "./src/f.ts": "-4849089835-import { a } from \"a\"; export const f = a;",
@@ -1091,7 +729,7 @@ declare module "d" {
   "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": 1382
 }
 
 
@@ -1182,13 +820,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1250,23 +882,11 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1232
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1192
-=======
-  "size": 1233
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1273
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1327,13 +947,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1314
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1274
-=======
-  "size": 1315
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1355
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1564,13 +1178,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1632,13 +1240,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1250
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1210
-=======
-  "size": 1251
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1291
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
@@ -1762,13 +1364,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1831,13 +1427,7 @@ Found 2 errors.
   "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",
-<<<<<<< HEAD
-  "size": 1293
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1253
-=======
-  "size": 1294
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1334
 }
 
 
@@ -1948,13 +1538,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -2017,23 +1601,11 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1349
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1309
-=======
-  "size": 1350
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1390
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -2095,13 +1667,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1373
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1333
-=======
-  "size": 1374
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1414
 }
 
 
@@ -2213,13 +1779,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./src/a.ts","./src/b.ts","./src/c.ts","./src/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project1/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -2281,23 +1841,11 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1370
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1330
-=======
-  "size": 1371
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1411
 }
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/outfile.d.ts","./src/e.ts","./src/f.ts","./src/g.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/project2/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -2358,13 +1906,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1372
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1332
-=======
-  "size": 1373
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1413
 }
 
 //// [/home/src/workspaces/solution/project1/outFile.js]
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 855f5f853cc23..1ba7ee0c538e0 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
@@ -78,13 +78,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -130,13 +124,7 @@ declare module "b" {
   "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",
-<<<<<<< HEAD
-  "size": 920
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 880
-=======
-  "size": 903
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 943
 }
 
 
@@ -233,13 +221,7 @@ declare module "b" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -286,13 +268,7 @@ declare module "b" {
   "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",
-<<<<<<< HEAD
-  "size": 1005
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 965
-=======
-  "size": 988
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1028
 }
 
 
@@ -352,89 +328,5 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/home/src/workspaces/outFile.tsbuildinfo]
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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"}
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-<<<<<<< HEAD
-//// [/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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 991
-}
-
-
-exitCode:: ExitStatus.Success
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-=======
 exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
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 5acd87ea5ea62..f1fd49c2bb25e 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
@@ -86,13 +86,7 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -148,13 +142,7 @@ define("index", ["require", "exports", "ky"], function (require, exports, ky_1)
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1134
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1094
-=======
-  "size": 1131
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1171
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-used-inferred-type-from-referenced-project.js b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-used-inferred-type-from-referenced-project.js
index 484afa522bbf6..bba473c6b56b1 100644
--- a/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-used-inferred-type-from-referenced-project.js
+++ b/tests/baselines/reference/tsbuild/declarationEmit/when-declaration-file-used-inferred-type-from-referenced-project.js
@@ -81,10 +81,25 @@ Output::
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/packages/pkg1/tsconfig.json'...
 
+packages/pkg1/tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 [HH:MM:SS AM] Project 'packages/pkg2/tsconfig.json' is out of date because output file 'packages/pkg2/lib/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/project/packages/pkg2/tsconfig.json'...
 
+packages/pkg2/tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
+
+Found 2 errors.
+
 
 
 //// [/home/src/workspaces/project/packages/pkg1/lib/src/index.js]
@@ -102,7 +117,7 @@ export interface IThings {
 
 
 //// [/home/src/workspaces/project/packages/pkg1/lib/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../src/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2072077482-export interface IThing {\n  a: string;\n}\nexport interface IThings {\n  thing1: IThing;\n}","signature":"-6291959392-export interface IThing {\n    a: string;\n}\nexport interface IThings {\n    thing1: IThing;\n}\n"}],"root":[2],"options":{"composite":true,"outDir":"./"},"latestChangedDtsFile":"./src/index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../src/index.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2072077482-export interface IThing {\n  a: string;\n}\nexport interface IThings {\n  thing1: IThing;\n}","signature":"-6291959392-export interface IThing {\n    a: string;\n}\nexport interface IThings {\n    thing1: IThing;\n}\n"}],"root":[2],"options":{"composite":true,"outDir":"./"},"semanticDiagnosticsPerFile":[1,2],"latestChangedDtsFile":"./src/index.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/packages/pkg1/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -139,9 +154,19 @@ export interface IThings {
     "composite": true,
     "outDir": "./"
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/index.d.ts",
   "version": "FakeTSVersion",
-  "size": 932
+  "size": 967
 }
 
 //// [/home/src/workspaces/project/packages/pkg2/lib/src/index.js]
@@ -159,7 +184,7 @@ export declare function fn4(): import("@fluentui/pkg1").IThing;
 
 
 //// [/home/src/workspaces/project/packages/pkg2/lib/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../pkg1/lib/src/index.d.ts","../src/index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-6291959392-export interface IThing {\n    a: string;\n}\nexport interface IThings {\n    thing1: IThing;\n}\n",{"version":"8515046367-import { IThings } from '@fluentui/pkg1';\nexport function fn4() {\n  const a: IThings = { thing1: { a: 'b' } };\n  return a.thing1;\n}","signature":"-8485768540-export declare function fn4(): import(\"@fluentui/pkg1\").IThing;\n"}],"root":[3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.d.ts","../../pkg1/lib/src/index.d.ts","../src/index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-6291959392-export interface IThing {\n    a: string;\n}\nexport interface IThings {\n    thing1: IThing;\n}\n",{"version":"8515046367-import { IThings } from '@fluentui/pkg1';\nexport function fn4() {\n  const a: IThings = { thing1: { a: 'b' } };\n  return a.thing1;\n}","signature":"-8485768540-export declare function fn4(): import(\"@fluentui/pkg1\").IThing;\n"}],"root":[3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./src/index.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/packages/pkg2/lib/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -211,10 +236,24 @@ export declare function fn4(): import("@fluentui/pkg1").IThing;
       "../../pkg1/lib/src/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../pkg1/lib/src/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1132
+  "size": 1169
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/extends/configDir-template.js b/tests/baselines/reference/tsbuild/extends/configDir-template.js
index 51b7323242b89..5b27bbc4bd57d 100644
--- a/tests/baselines/reference/tsbuild/extends/configDir-template.js
+++ b/tests/baselines/reference/tsbuild/extends/configDir-template.js
@@ -140,6 +140,12 @@ File '/home/src/projects/myproject/root2/other/sometype2/package.json' does not
 File '/home/src/projects/myproject/root2/other/sometype2/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/index.d.ts', result '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'.
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -150,6 +156,9 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
+
+Found 1 error.
+
 
 
 //// [/home/src/projects/myproject/outDir/types/sometype.js]
@@ -188,7 +197,7 @@ export declare const z = 10;
 
 
 //// [/home/src/projects/myproject/outDir/tsconfig.tsbuildinfo]
-{"root":["../main.ts","../src/secondary.ts"],"version":"FakeTSVersion"}
+{"root":["../main.ts","../src/secondary.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/myproject/outDir/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -196,9 +205,10 @@ export declare const z = 10;
     "../main.ts",
     "../src/secondary.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 71
+  "size": 85
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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 f4d66334322c4..f19eb52448654 100644
--- a/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
+++ b/tests/baselines/reference/tsbuild/fileDelete/outFile/detects-deleted-file.js
@@ -172,13 +172,7 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child2.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child2.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -224,13 +218,7 @@ declare module "child" {
   "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",
-<<<<<<< HEAD
-  "size": 1008
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 968
-=======
-  "size": 1005
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1045
 }
 
 //// [/home/src/workspaces/solution/mainResult.js]
@@ -251,13 +239,7 @@ declare module "main" {
 
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -299,13 +281,7 @@ declare module "main" {
   "outSignature": "7955277823-declare module \"main\" {\n    export function main(): void;\n}\n",
   "latestChangedDtsFile": "./mainResult.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1023
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 983
-=======
-  "size": 1020
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1060
 }
 
 
@@ -421,13 +397,7 @@ declare module "child" {
 
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./child/child.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/childResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -463,24 +433,12 @@ declare module "child" {
   "outSignature": "8966811613-declare module \"child\" {\n    export function child(): void;\n}\n",
   "latestChangedDtsFile": "./childResult.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1119
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1079
-=======
-  "size": 867
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 907
 }
 
 //// [/home/src/workspaces/solution/mainResult.js] file written with same contents
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./childresult.d.ts","./main/main.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/mainResult.tsbuildinfo.readable.baseline.txt]
 {
@@ -522,13 +480,7 @@ declare module "child" {
   "outSignature": "7955277823-declare module \"main\" {\n    export function main(): void;\n}\n",
   "latestChangedDtsFile": "./mainResult.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 954
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 914
-=======
-  "size": 951
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 991
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
index ff8661bf77bc8..17cd5ea2ec356 100644
--- a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-preserveSymlinks.js
@@ -76,6 +76,12 @@ Resolving module name 'const' relative to base url '/user/username/projects/mypr
 Loading module as file / folder, candidate module location '/user/username/projects/myproject/packages/pkg2/const', target file types: TypeScript, JavaScript, Declaration, JSON.
 File '/user/username/projects/myproject/packages/pkg2/const.ts' exists - use it as a name resolution result.
 ======== Module name 'const' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/const.ts'. ========
+packages/pkg2/tsconfig.json:5:5 - 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.
+
+5     "baseUrl": ".",
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'packages/pkg1/tsconfig.json' is out of date because output file 'packages/pkg1/build/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
@@ -119,6 +125,9 @@ Resolving module name 'const' relative to base url '/user/username/projects/mypr
 Loading module as file / folder, candidate module location '/user/username/projects/myproject/packages/pkg2/const', target file types: TypeScript, JavaScript, Declaration, JSON.
 File '/user/username/projects/myproject/packages/pkg2/const.ts' exists - use it as a name resolution result.
 ======== Module name 'const' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/const.ts'. ========
+
+Found 1 error.
+
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.js]
@@ -140,7 +149,7 @@ export type { TheNum } from 'const';
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"root":[2,3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"root":[2,3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -200,9 +209,23 @@ export type { TheNum } from 'const';
       "../const.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../const.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 990
+  "size": 1027
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
@@ -225,4 +248,4 @@ exports.theNum = 42;
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
index 413ebfaaee364..ddd851ba631b0 100644
--- a/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
+++ b/tests/baselines/reference/tsbuild/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly.js
@@ -74,6 +74,12 @@ Resolving module name 'const' relative to base url '/user/username/projects/mypr
 Loading module as file / folder, candidate module location '/user/username/projects/myproject/packages/pkg2/const', target file types: TypeScript, JavaScript, Declaration, JSON.
 File '/user/username/projects/myproject/packages/pkg2/const.ts' exists - use it as a name resolution result.
 ======== Module name 'const' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/const.ts'. ========
+packages/pkg2/tsconfig.json:5:5 - 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.
+
+5     "baseUrl": "."
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'packages/pkg1/tsconfig.json' is out of date because output file 'packages/pkg1/build/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
@@ -116,6 +122,9 @@ Resolving module name 'const' relative to base url '/user/username/projects/mypr
 Loading module as file / folder, candidate module location '/user/username/projects/myproject/packages/pkg2/const', target file types: TypeScript, JavaScript, Declaration, JSON.
 File '/user/username/projects/myproject/packages/pkg2/const.ts' exists - use it as a name resolution result.
 ======== Module name 'const' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/const.ts'. ========
+
+Found 1 error.
+
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/const.js]
@@ -137,7 +146,7 @@ export type { TheNum } from 'const';
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"root":[2,3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-10837689162-export type { TheNum } from 'const';","signature":"-9751391360-export type { TheNum } from 'const';\n"}],"root":[2,3],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -197,9 +206,23 @@ export type { TheNum } from 'const';
       "../const.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../const.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 990
+  "size": 1027
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
@@ -222,4 +245,4 @@ exports.theNum = 42;
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
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 1bdec8772adc1..6d49f8dfcae65 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
@@ -360,13 +360,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -410,13 +404,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -712,13 +700,7 @@ Found 2 errors.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -785,13 +767,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 
@@ -960,13 +936,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1010,13 +980,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -1092,13 +1056,7 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1151,13 +1109,7 @@ define("c", ["require", "exports"], function (require, exports) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1528,13 +1480,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1587,13 +1533,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
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 22b1bab7580e0..9502193221352 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
@@ -317,13 +317,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -367,13 +361,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -616,13 +604,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -666,13 +648,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 722
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 762
 }
 
 
@@ -835,13 +811,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -885,13 +855,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -979,13 +943,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1038,13 +996,7 @@ declare module "c" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1348,13 +1300,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1407,13 +1353,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
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 63f361b75c04d..a116c44b32434 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
@@ -323,13 +323,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -373,13 +367,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -841,13 +829,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -891,13 +873,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -985,13 +961,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1044,13 +1014,7 @@ declare module "c" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1372,13 +1336,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1431,13 +1389,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
index 1c8642c343696..73644f8a62a02 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-composite.js
@@ -136,13 +136,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,13 +212,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
@@ -311,13 +299,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -366,13 +348,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2653
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2613
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -408,13 +384,7 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -490,13 +460,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
@@ -699,13 +663,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -781,13 +739,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2635
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2595
-=======
-  "size": 1849
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1889
 }
 
 
@@ -926,13 +878,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -981,13 +927,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2074
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2034
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -1081,13 +1021,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1163,13 +1097,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
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 de28cc737c63b..22eae7efb2b07 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental-declaration.js
@@ -137,13 +137,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -217,13 +211,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
@@ -310,13 +298,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -363,13 +345,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2104
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2064
-=======
-  "size": 1273
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1313
 }
 
 
@@ -406,13 +382,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]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -486,13 +456,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
@@ -695,13 +659,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -775,13 +733,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2084
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2044
-=======
-  "size": 1298
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1338
 }
 
 
@@ -920,13 +872,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -973,13 +919,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1271
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1311
 }
 
 
@@ -1073,13 +1013,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1153,13 +1087,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
index 363a38990293b..3fe96d7dcfe38 100644
--- a/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsbuild/noEmit/outFile/changes-incremental.js
@@ -116,13 +116,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -195,13 +189,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
@@ -288,13 +276,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -340,13 +322,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2085
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2045
-=======
-  "size": 1254
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1294
 }
 
 
@@ -382,13 +358,7 @@ Found 1 error.
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -461,13 +431,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
@@ -650,13 +614,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -729,13 +687,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2065
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2025
-=======
-  "size": 1279
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1319
 }
 
 
@@ -874,13 +826,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -926,13 +872,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1252
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1292
 }
 
 
@@ -1006,13 +946,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1085,13 +1019,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
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 0746abad1d51a..0f4ceadea21cd 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
@@ -72,13 +72,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -131,13 +125,7 @@ Found 1 error.
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1521
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1481
-=======
-  "size": 1281
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1321
 }
 
 
@@ -167,13 +155,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -249,13 +231,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -354,13 +330,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -436,13 +406,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2635
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2595
-=======
-  "size": 1849
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1889
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -541,13 +505,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -596,13 +554,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2074
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2034
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -632,13 +584,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -714,13 +660,7 @@ Found 1 error.
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 //// [/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 0405cf22e5b0e..5d46a1f6f32a1 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
@@ -73,13 +73,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -132,13 +126,7 @@ Found 1 error.
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1283
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1323
 }
 
 
@@ -168,13 +156,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -248,13 +230,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -353,13 +329,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -433,13 +403,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2084
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2044
-=======
-  "size": 1298
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1338
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -538,13 +502,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -591,13 +549,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1271
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1311
 }
 
 
@@ -627,13 +579,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -707,13 +653,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 //// [/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 a01573c7a666d..677bbcdbd5cfe 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
@@ -72,13 +72,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -130,13 +124,7 @@ Found 1 error.
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1264
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1304
 }
 
 
@@ -166,13 +154,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -245,13 +227,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -330,13 +306,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -409,13 +379,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2065
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2025
-=======
-  "size": 1279
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1319
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -494,13 +458,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -546,13 +504,7 @@ Found 1 error.
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1252
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1292
 }
 
 
@@ -582,13 +534,7 @@ Found 1 error.
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -661,13 +607,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 //// [/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 e3c66a852c1b8..29574111bbf25 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,108 +53,4 @@ 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/projects/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
-*** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+*** Supplied discrepancy explanation but didnt find any difference
\ 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 45d4f2589c10c..4eab9e742c7bd 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
@@ -51,13 +51,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -91,13 +85,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 733
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 693
-=======
-  "size": 697
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 737
 }
 
 
@@ -197,13 +185,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -238,13 +220,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 716
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 756
 }
 
 
@@ -297,13 +273,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -339,13 +309,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1077
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1037
-=======
-  "size": 738
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 778
 }
 
 
@@ -457,13 +421,7 @@ Found 2 errors.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -530,13 +488,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 //// [/home/src/projects/outFile.js]
@@ -611,13 +563,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -701,13 +647,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -740,13 +680,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 748
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 708
-=======
-  "size": 711
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 751
 }
 
 
@@ -799,7 +733,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; };","-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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -809,7 +743,7 @@ Found 1 error.
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -833,7 +767,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 733
+  "size": 773
 }
 
 
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 c3878746b89a3..0b229256005d3 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
@@ -57,13 +57,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -107,13 +101,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 885
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 845
-=======
-  "size": 853
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 893
 }
 
 
@@ -221,13 +209,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -272,13 +254,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1765
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1725
-=======
-  "size": 872
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 912
 }
 
 
@@ -335,13 +311,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -387,13 +357,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1787
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1747
-=======
-  "size": 894
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 934
 }
 
 
@@ -533,13 +497,7 @@ Found 4 errors.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -664,13 +622,7 @@ Found 4 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1748
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1708
-=======
-  "size": 1749
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1789
 }
 
 //// [/home/src/projects/outFile.js]
@@ -771,13 +723,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -873,13 +819,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -920,13 +860,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1485
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1445
-=======
-  "size": 863
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
 }
 
 
@@ -983,13 +917,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1031,13 +959,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 885
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 925
 }
 
 
@@ -1098,13 +1020,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1147,13 +1063,7 @@ Found 1 error.
     "./project/c.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1227
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1187
-=======
-  "size": 886
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 926
 }
 
 
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
index c31c43cffeb6f..40828c959d4dc 100644
--- 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
@@ -8,7 +8,7 @@ Incremental buildInfoText:: {
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -65,7 +65,7 @@ Incremental buildInfoText:: {
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 1075
 }
 Clean buildInfoText:: {
   "fileNames": [
@@ -74,7 +74,7 @@ Clean buildInfoText:: {
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -99,5 +99,5 @@ Clean buildInfoText:: {
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 756
 }
\ 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 9e6d7f0ba0d0a..069a767ec9657 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
@@ -52,13 +52,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -93,13 +87,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 716
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 756
 }
 
 
@@ -204,13 +192,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -245,13 +227,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 734
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 694
-=======
-  "size": 701
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 741
 }
 
 
@@ -353,13 +329,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -403,13 +373,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 //// [/home/src/projects/outFile.js]
@@ -537,13 +501,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -576,13 +534,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 712
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 752
 }
 
 
@@ -645,13 +597,7 @@ Found 2 errors.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -718,13 +664,7 @@ Found 2 errors.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 //// [/home/src/projects/outFile.js]
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 5164dffda45c6..178928944d272 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
@@ -51,13 +51,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -91,13 +85,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 733
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 693
-=======
-  "size": 697
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 737
 }
 
 
@@ -200,13 +188,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -240,13 +222,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -346,13 +322,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -395,13 +365,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -518,13 +482,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -608,13 +566,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -657,13 +609,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 713
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 673
-=======
-  "size": 710
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 750
 }
 
 //// [/home/src/projects/outFile.js]
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 742467087026b..1f00c286d7301 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
@@ -51,13 +51,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -91,13 +85,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 689
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 729
 }
 
 
@@ -200,13 +188,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -240,13 +222,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -346,13 +322,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -395,13 +365,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -518,13 +482,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -556,13 +514,7 @@ Found 1 error.
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 685
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 725
 }
 
 
@@ -614,13 +566,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -663,13 +609,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 857
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 817
-=======
-  "size": 702
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 742
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
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 fe8d9b592eac4..468f474307d09 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
@@ -188,13 +188,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -228,13 +222,7 @@ Found 1 error.
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -334,13 +322,7 @@ Found 1 error.
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -383,13 +365,7 @@ Found 1 error.
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
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 161c9326e7be7..6c8fa8e796b12 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
@@ -63,13 +63,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -110,13 +104,7 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1274
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1234
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 
@@ -231,13 +219,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -278,101 +260,9 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 943
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 903
-=======
-  "size": 937
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 977
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 354f056e42faa..0723d5ae294e1 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
@@ -191,122 +191,8 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 9174590a799c6..f3776e2c93567 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
@@ -51,55 +51,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -108,17 +59,10 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error.
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -158,13 +102,7 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 926
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 966
 }
 
 
@@ -277,13 +215,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -323,13 +255,7 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 918
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 958
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
index 3f9d7f368fe3a..17c7738273259 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/dts-errors.js
@@ -50,55 +50,6 @@ Output::
 
 [HH:MM:SS AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -107,7 +58,6 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error.
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
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 e6a9bfeb2f909..6d04575593332 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
@@ -240,13 +240,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -287,77 +281,9 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 935
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 895
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 54b3986fa99a3..7c253d20c23b9 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
@@ -199,98 +199,8 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 2f7cf3b8a02b4..fdc4ec42d11cf 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
@@ -236,13 +236,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -282,53 +276,9 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 910
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 950
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
index ba5532eda17c8..89af6eb015f6f 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/semantic-errors.js
@@ -196,74 +196,8 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 5fa936e9ca081..bdebe63c1836d 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
@@ -232,13 +232,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -279,81 +273,9 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 944
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 904
-=======
-  "size": 938
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 978
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 9a7a8b78517de..ae039804db6e3 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
@@ -204,102 +204,8 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 e993fecaeba47..43164c67d4146 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
@@ -228,13 +228,7 @@ Found 1 error.
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -274,57 +268,9 @@ Found 1 error.
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 925
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 885
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
diff --git a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
index d83a3091fa000..d77365b90b7fb 100644
--- a/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsbuild/noEmitOnError/outFile/syntax-errors.js
@@ -201,78 +201,8 @@ Found 1 error.
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 805966c93cf62..719abc93d3de4 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
@@ -219,13 +219,7 @@ declare function f(): string;
 //# sourceMappingURL=first_part3.d.ts.map
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./first_part1.ts","./first_part2.ts","./first_part3.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./first_part1.ts","./first_part2.ts","./first_part3.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/first/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -319,13 +313,7 @@ declare function f(): string;
   ],
   "latestChangedDtsFile": "./first_part3.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1443
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1403
-=======
-  "size": 1442
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1482
 }
 
 //// [/home/src/workspaces/solution/second/second_part1.js.map]
@@ -372,13 +360,7 @@ declare class C {
 //# sourceMappingURL=second_part2.d.ts.map
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./second_part1.ts","./second_part2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","./second_part1.ts","./second_part2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/second/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -455,13 +437,7 @@ declare class C {
   ],
   "latestChangedDtsFile": "./second_part2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1319
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1279
-=======
-  "size": 1316
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1356
 }
 
 //// [/home/src/workspaces/solution/third/third_part1.js.map]
@@ -480,13 +456,7 @@ declare var c: C;
 //# sourceMappingURL=third_part1.d.ts.map
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/solution/third/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -609,13 +579,7 @@ declare var c: C;
   ],
   "latestChangedDtsFile": "./third_part1.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1621
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1581
-=======
-  "size": 1626
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1666
 }
 
 
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
index 2dc33dc75cfe7..dbef5e42d1482 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file-non-composite.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file.js b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file.js
index 1d52395abe915..f2f41e2ef333b 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/files-containing-json-file.js
@@ -54,6 +54,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
index bd6458c8de221..a5bfeead96dab 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files-non-composite.js
@@ -55,6 +55,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files.js
index 22696dc7839a1..c8bec6822198e 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-and-files.js
@@ -56,6 +56,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
index ff3e31cec637c..0a0d181116349 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file-non-composite.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file.js
index f51abd24a3f27..f61ef4423089a 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-and-file-name-matches-ts-file.js
@@ -54,6 +54,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
index 423aff995b06a..72ae4c26d4fce 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include-non-composite.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include.js
index a8487ca0bcc2b..d2dc41466da6e 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-of-json-along-with-other-include.js
@@ -54,6 +54,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
index 855cd0276ce0f..ad065b1fae5e5 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-non-composite.js
@@ -52,6 +52,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir-non-composite.js
index 1a43346701800..822e5c984b906 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir-non-composite.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir.js
index ac87f2066ab92..24fe2b97857a6 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-not-in-rootDir.js
@@ -54,6 +54,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
index a876a42d1f4b3..1e466b8c7f2e5 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory-non-composite.js
@@ -52,6 +52,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory.js
index 44e586d2bce84..9a24f219e329a 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-with-json-without-rootDir-but-outside-configDirectory.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir-non-composite.js
index dc65c43771ff2..ab52e54412b05 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir-non-composite.js
@@ -51,6 +51,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir.js
index ab596148b2cf9..0df1cb52dcf99 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only-without-outDir.js
@@ -52,6 +52,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only.js b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only.js
index 71bb6700db58b..b4e9a60f26f19 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/include-only.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/include-only.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
index ea9735b086ff0..dd710a7f624ea 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap-non-composite.js
@@ -54,6 +54,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
@@ -124,6 +125,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap.js b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap.js
index e2b14e4a073ec..d76164b0c286c 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/sourcemap.js
@@ -55,6 +55,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
@@ -198,6 +199,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir-non-composite.js b/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir-non-composite.js
index 6bdc4c43ce81d..bd96528a53779 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir-non-composite.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir-non-composite.js
@@ -52,6 +52,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
@@ -111,6 +112,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir.js b/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir.js
index 6a55b1e5b05f8..af739254ef5de 100644
--- a/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir.js
+++ b/tests/baselines/reference/tsbuild/resolveJsonModule/without-outDir.js
@@ -53,6 +53,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
@@ -183,6 +184,7 @@ Output::
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/project/tsconfig.json'...
 
 project/tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js b/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
index d731203537bb7..53992e0f59085 100644
--- a/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
+++ b/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
@@ -119,6 +119,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -133,6 +139,9 @@ projects/shared/dist/src/random.d.ts
   File is output of project reference source 'projects/shared/src/random.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/src/logging.js]
@@ -254,7 +263,7 @@ export {};
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"2292560907-export declare function log(str: string): void;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"2292560907-export declare function log(str: string): void;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -360,13 +369,35 @@ export {};
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1344
+  "size": 1385
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -380,12 +411,48 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/random.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/server/src/server.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+projects/shared/dist/src/myClass.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/shared/dist/src/random.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/random.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: edit logging file
 
@@ -415,7 +482,7 @@ projects/shared/src/myClass.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
 projects/shared/src/random.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because output 'projects/server/dist/server/tsconfig.tsbuildinfo' is older than input 'projects/shared/src/logging.ts'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -430,6 +497,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -444,6 +517,9 @@ projects/shared/dist/src/random.d.ts
   File is output of project reference source 'projects/shared/src/random.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/src/logging.js]
@@ -531,7 +607,7 @@ export declare const x = 10;
 }
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -637,13 +713,35 @@ export declare const x = 10;
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1375
+  "size": 1416
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -657,12 +755,48 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+projects/shared/dist/src/myClass.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/shared/dist/src/random.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/random.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: delete random file
 
@@ -685,7 +819,7 @@ projects/shared/src/logging.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
 projects/shared/src/myClass.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that file 'projects/shared/src/random.ts' was root file of compilation but not any more.
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -700,6 +834,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -711,6 +851,9 @@ projects/shared/dist/src/myClass.d.ts
   File is output of project reference source 'projects/shared/src/myClass.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/tsconfig.tsbuildinfo]
@@ -770,7 +913,7 @@ projects/server/src/server.ts
 }
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,4]],"resolvedRoot":[[2,5],[3,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[4,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,4]],"resolvedRoot":[[2,5],[3,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -859,13 +1002,31 @@ projects/server/src/server.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1229
+  "size": 1268
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -879,9 +1040,42 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+projects/shared/dist/src/myClass.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
diff --git a/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project.js b/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project.js
index ddd13eb4c8a07..5415659e44516 100644
--- a/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project.js
+++ b/tests/baselines/reference/tsbuild/roots/when-root-file-is-from-referenced-project.js
@@ -119,6 +119,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -133,6 +139,9 @@ projects/shared/dist/src/logging.d.ts
 projects/shared/dist/src/random.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/random.ts'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/src/logging.js]
@@ -254,7 +263,7 @@ export {};
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"2292560907-export declare function log(str: string): void;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"2292560907-export declare function log(str: string): void;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -360,13 +369,35 @@ export {};
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1344
+  "size": 1385
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -380,12 +411,48 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/random.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/server/src/server.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/myClass.d.ts
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+projects/shared/dist/src/random.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/random.ts'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: edit logging file
 
@@ -415,7 +482,7 @@ projects/shared/src/myClass.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
 projects/shared/src/random.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because output 'projects/server/dist/server/tsconfig.tsbuildinfo' is older than input 'projects/shared/src/logging.ts'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -430,6 +497,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -444,6 +517,9 @@ projects/shared/dist/src/logging.d.ts
 projects/shared/dist/src/random.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/random.ts'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/src/logging.js]
@@ -531,7 +607,7 @@ export declare const x = 10;
 }
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -637,13 +713,35 @@ export declare const x = 10;
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1375
+  "size": 1416
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -657,12 +755,48 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/myClass.d.ts
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+projects/shared/dist/src/random.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/random.ts'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
 Change:: delete random file
 
@@ -685,7 +819,7 @@ projects/shared/src/logging.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
 projects/shared/src/myClass.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/shared/tsconfig.json'
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that file 'projects/shared/src/random.ts' was root file of compilation but not any more.
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -700,6 +834,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -711,6 +851,9 @@ projects/server/src/server.ts
 projects/shared/dist/src/logging.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/logging.ts'
+
+Found 1 error.
+
 
 
 //// [/home/src/workspaces/solution/projects/shared/dist/tsconfig.tsbuildinfo]
@@ -770,7 +913,7 @@ projects/shared/dist/src/logging.d.ts
 }
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -859,13 +1002,31 @@ projects/shared/dist/src/logging.d.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1229
+  "size": 1268
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: No change
 
@@ -879,9 +1040,42 @@ Output::
 
 [HH:MM:SS AM] Project 'projects/shared/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/shared/dist/tsconfig.tsbuildinfo'
 
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is up to date because newest input 'projects/shared/src/logging.ts' is older than output 'projects/server/dist/server/tsconfig.tsbuildinfo'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
+
+[HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
+
+======== Resolving module ':shared/myClass.js' from '/home/src/workspaces/solution/projects/server/src/server.ts'. ========
+Module resolution kind is not specified, using 'Bundler'.
+Resolving in CJS mode with conditions 'require', 'types'.
+'baseUrl' option is set to '/home/src/workspaces/solution/projects/server/src', using this value to resolve non-relative module name ':shared/myClass.js'.
+'paths' option is specified, looking for a pattern to match module name ':shared/myClass.js'.
+Module name ':shared/myClass.js', matched pattern ':shared/*'.
+Trying substitution '../../shared/src/*', candidate module location: '../../shared/src/myClass.js'.
+Loading module as file / folder, candidate module location '/home/src/workspaces/solution/projects/shared/src/myClass.js', target file types: TypeScript, JavaScript, Declaration, JSON.
+File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
+File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
+======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
+../../tslibs/TS/Lib/lib.d.ts
+  Default library for target 'es5'
+projects/shared/dist/src/myClass.d.ts
+  Imported via ':shared/myClass.js' from file 'projects/server/src/server.ts'
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/myClass.ts'
+projects/server/src/server.ts
+  Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
+projects/shared/dist/src/logging.d.ts
+  Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
+  File is output of project reference source 'projects/shared/src/logging.ts'
+
+Found 1 error.
 
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
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
index a4c8e54197d92..497d4adf1d5e0 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes-discrepancies.js
@@ -5,7 +5,7 @@ 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; };",
+      "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": {
@@ -41,7 +41,7 @@ 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; };",
+      "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": {
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 296a2c616041b..c6715358d9902 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-module-option-changes.js
@@ -238,13 +238,7 @@ define(["require", "exports"], function (require, exports) {
 
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./anothermodule.ts","./index.ts","./some_decl.d.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./anothermodule.ts","./index.ts","./some_decl.d.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/sample1/core/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -300,13 +294,7 @@ define(["require", "exports"], function (require, exports) {
   },
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 995
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 955
-=======
-  "size": 969
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1009
 }
 
 
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 148ae62ff9ef3..5438d97d5fd11 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
@@ -94,21 +94,20 @@ Output::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.d.ts
 /user/username/projects/transitiveReferences/b.ts
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.d.ts
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
-<<<<<<< HEAD
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-Found 1 error.
-
-=======
 
 Found 2 errors.
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/transitiveReferences/a.js]
@@ -181,13 +180,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -254,13 +247,7 @@ export declare const b: A;
   ],
   "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 915
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 875
-=======
-  "size": 912
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 952
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
@@ -273,16 +260,17 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly.js b/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly.js
index a96dba6bb3115..d93cab49ece1f 100644
--- a/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly.js
+++ b/tests/baselines/reference/tsbuild/transitiveReferences/builds-correctly.js
@@ -92,14 +92,29 @@ 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:5 - 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.
+
+4     "baseUrl": "./",
+      ~~~~~~~~~
+
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.d.ts
 /user/username/projects/transitiveReferences/b.ts
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.d.ts
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
+
+Found 2 errors.
+
 
 
 //// [/user/username/projects/transitiveReferences/a.js]
@@ -172,7 +187,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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/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"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -223,9 +238,23 @@ 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": 927
+  "size": 964
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
@@ -238,16 +267,17 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsbuild/transitiveReferences/reports-error-about-module-not-found-with-node-resolution-with-external-module-name.js b/tests/baselines/reference/tsbuild/transitiveReferences/reports-error-about-module-not-found-with-node-resolution-with-external-module-name.js
index 224e89d7982b0..43c49e6d7a1fb 100644
--- a/tests/baselines/reference/tsbuild/transitiveReferences/reports-error-about-module-not-found-with-node-resolution-with-external-module-name.js
+++ b/tests/baselines/reference/tsbuild/transitiveReferences/reports-error-about-module-not-found-with-node-resolution-with-external-module-name.js
@@ -87,18 +87,25 @@ Output::
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/a.ts
 tsconfig.b.json:4: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.
 
 4     "moduleResolution": "node"
                           ~~~~~~
 
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/b.ts
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 /home/src/tslibs/TS/Lib/lib.d.ts
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Found 1 error.
+Found 2 errors.
 
 
 
@@ -232,15 +239,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
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 fbbaf718c9d5c..a8359e70b8a12 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
@@ -80,13 +80,7 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -132,13 +126,7 @@ declare module "b" {
   "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",
-<<<<<<< HEAD
-  "size": 939
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 899
-=======
-  "size": 922
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 962
 }
 
 
@@ -304,13 +292,7 @@ declare module "b" {
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -357,13 +339,7 @@ declare module "b" {
   "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",
-<<<<<<< HEAD
-  "size": 963
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 923
-=======
-  "size": 946
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 986
 }
 
 
@@ -490,84 +466,6 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/user/username/projects/outFile.tsbuildinfo]
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/a.ts","./myproject/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 949
-}
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-}
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tsbuildWatch/extends/configDir-template.js b/tests/baselines/reference/tsbuildWatch/extends/configDir-template.js
index 41b718d1b54d4..5ebcb2e2f2e67 100644
--- a/tests/baselines/reference/tsbuildWatch/extends/configDir-template.js
+++ b/tests/baselines/reference/tsbuildWatch/extends/configDir-template.js
@@ -142,6 +142,12 @@ File '/home/src/projects/myproject/root2/other/sometype2/package.json' does not
 File '/home/src/projects/myproject/root2/other/sometype2/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/index.d.ts', result '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'.
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -152,7 +158,7 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 FileWatcher:: Added:: WatchInfo: /home/src/projects/myproject/tsconfig.json 2000 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Config file /home/src/projects/myproject/tsconfig.json
 FileWatcher:: Added:: WatchInfo: /home/src/projects/configs/first/tsconfig.json 2000 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Extended config file
@@ -206,7 +212,7 @@ export declare const z = 10;
 
 
 //// [/home/src/projects/myproject/outDir/tsconfig.tsbuildinfo]
-{"root":["../main.ts","../src/secondary.ts"],"version":"FakeTSVersion"}
+{"root":["../main.ts","../src/secondary.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/home/src/projects/myproject/outDir/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,8 +220,9 @@ export declare const z = 10;
     "../main.ts",
     "../src/secondary.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 71
+  "size": 85
 }
 
 
@@ -288,12 +295,7 @@ Program files::
 /home/src/projects/myproject/root2/other/sometype2/index.d.ts
 /home/src/projects/myproject/src/secondary.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/myproject/types/sometype.ts
-/home/src/projects/myproject/main.ts
-/home/src/projects/myproject/root2/other/sometype2/index.d.ts
-/home/src/projects/myproject/src/secondary.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -338,7 +340,7 @@ After running Timeout callback:: count: 0
 Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Project 'tsconfig.json' is out of date because output 'outDir/tsconfig.tsbuildinfo' is older than input '../configs/first/tsconfig.json'
+[HH:MM:SS AM] Project 'tsconfig.json' is out of date because buildinfo file 'outDir/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/projects/myproject/tsconfig.json'...
 
@@ -386,6 +388,12 @@ File '/home/src/projects/myproject/root2/other/sometype2/package.json' does not
 File '/home/src/projects/myproject/root2/other/sometype2/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/index.d.ts', result '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'.
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -396,17 +404,10 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
-[HH:MM:SS AM] Updating unchanged output timestamps of project '/home/src/projects/myproject/tsconfig.json'...
-
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/home/src/projects/myproject/outDir/main.js] file changed its modified time
-//// [/home/src/projects/myproject/decls/main.d.ts] file changed its modified time
-//// [/home/src/projects/myproject/outDir/src/secondary.js] file changed its modified time
-//// [/home/src/projects/myproject/decls/src/secondary.d.ts] file changed its modified time
-//// [/home/src/projects/myproject/outDir/tsconfig.tsbuildinfo] file changed its modified time
 
 
 Program root files: [
@@ -446,7 +447,7 @@ Program files::
 /home/src/projects/myproject/root2/other/sometype2/index.d.ts
 /home/src/projects/myproject/src/secondary.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 6b7fad3602c05..4df100816b7e7 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -86,6 +86,12 @@ Loading module as file / folder, candidate module location '/user/username/proje
 File name '/user/username/projects/myproject/packages/pkg2/const.js' has a '.js' extension - stripping it.
 File '/user/username/projects/myproject/packages/pkg2/const.ts' exists - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/const.ts'. ========
+packages/pkg2/tsconfig.json:5:5 - 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.
+
+5     "baseUrl": "."
+      ~~~~~~~~~
+
 [HH:MM:SS AM] Project 'packages/pkg1/tsconfig.json' is out of date because output file 'packages/pkg1/build/tsconfig.tsbuildinfo' does not exist
 
 [HH:MM:SS AM] Building project '/user/username/projects/myproject/packages/pkg1/tsconfig.json'...
@@ -123,7 +129,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exists - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -155,7 +161,7 @@ export type TheStr = string;
 
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts","../other.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-11225381282-export type { TheNum } from './const.js';","signature":"-9660329432-export type { TheNum } from './const.js';\n"},{"version":"-4609154030-export type TheStr = string;","signature":"-6073194916-export type TheStr = string;\n"}],"root":[[2,4]],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./other.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../const.ts","../index.ts","../other.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11202312776-export type TheNum = 42;","signature":"-13194036030-export type TheNum = 42;\n"},{"version":"-11225381282-export type { TheNum } from './const.js';","signature":"-9660329432-export type { TheNum } from './const.js';\n"},{"version":"-4609154030-export type TheStr = string;","signature":"-6073194916-export type TheStr = string;\n"}],"root":[[2,4]],"options":{"composite":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./other.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/packages/pkg2/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -227,9 +233,27 @@ export type TheStr = string;
       "../const.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../const.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../index.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../other.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./other.d.ts",
   "version": "FakeTSVersion",
-  "size": 1128
+  "size": 1167
 }
 
 //// [/user/username/projects/myproject/packages/pkg1/build/index.js]
@@ -297,11 +321,7 @@ Program files::
 /user/username/projects/myproject/packages/pkg2/index.ts
 /user/username/projects/myproject/packages/pkg2/other.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/packages/pkg2/const.ts
-/user/username/projects/myproject/packages/pkg2/index.ts
-/user/username/projects/myproject/packages/pkg2/other.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -395,7 +415,13 @@ Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/bui
 1 import type { TheNum } from 'pkg2'
                 ~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+packages/pkg2/tsconfig.json:5:5 - 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.
+
+5     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -501,7 +527,13 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exists - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+packages/pkg2/tsconfig.json:5:5 - 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.
+
+5     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
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 dfc0a4774bb7f..eb2188fadf362 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
@@ -203,13 +203,7 @@ export {};
 
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -290,13 +284,7 @@ export {};
   ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 973
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 933
-=======
-  "size": 972
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1012
 }
 
 
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 9f8b03c218e9f..cab6656eb5b4c 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
@@ -55,13 +55,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -96,13 +90,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 716
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 756
 }
 
 
@@ -177,13 +165,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -218,13 +200,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 734
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 694
-=======
-  "size": 701
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 741
 }
 
 
@@ -295,13 +271,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -345,13 +315,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 //// [/home/src/projects/outFile.js]
@@ -506,13 +470,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -545,13 +503,7 @@ Output::
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 712
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 752
 }
 
 
@@ -632,13 +584,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -705,13 +651,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 //// [/home/src/projects/outFile.js]
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 bf1dd4ad67915..c74bfd1b2d0be 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
@@ -54,13 +54,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -94,13 +88,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 733
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 693
-=======
-  "size": 697
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 737
 }
 
 
@@ -174,13 +162,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,13 +196,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -289,13 +265,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -338,13 +308,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -487,13 +451,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -594,13 +552,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -643,13 +595,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 713
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 673
-=======
-  "size": 710
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 750
 }
 
 //// [/home/src/projects/outFile.js]
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 17282aff4f5fc..13f8d086af98f 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
@@ -54,13 +54,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -94,13 +88,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 689
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 729
 }
 
 
@@ -174,13 +162,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,13 +196,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -289,13 +265,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -338,13 +308,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -487,13 +451,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -525,13 +483,7 @@ Output::
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 685
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 725
 }
 
 
@@ -600,13 +552,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -649,13 +595,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 857
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 817
-=======
-  "size": 702
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 742
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
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 9ef4512f6dd4b..55734acca2a1b 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
@@ -162,13 +162,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -202,13 +196,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -277,13 +265,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -326,13 +308,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
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 ed95df643c5d4..940db1db12a15 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
@@ -264,13 +264,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -311,81 +305,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 944
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 904
-=======
-  "size": 938
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 978
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -709,13 +631,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -756,55 +672,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 935
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 895
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -934,13 +804,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -981,13 +845,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1274
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1234
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 
@@ -1119,13 +977,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -1166,101 +1018,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 943
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 903
-=======
-  "size": 937
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 977
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
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 c57f4be19af32..587c33d762383 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -230,102 +230,8 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -588,76 +494,8 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -912,122 +750,8 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
 //// [/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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 2658289c04fa4..76d98eacf5c3c 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -260,13 +260,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -306,57 +300,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 925
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 885
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -675,13 +621,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -721,53 +661,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 910
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 950
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -895,13 +791,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -941,65 +831,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 926
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 966
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -1127,13 +961,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -1173,13 +1001,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 918
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 958
 }
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
index e5be942d5979c..18dca6509c912 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -227,78 +227,8 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -557,74 +487,8 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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.tsbuildinfo] file written with same contents
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt] file written with same contents
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -751,56 +615,6 @@ Output::
 
 //// [/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
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
diff --git a/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js b/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
index edd6ebee1a468..98594d69e0fac 100644
--- a/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
+++ b/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project-and-shared-is-first.js
@@ -122,6 +122,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -136,7 +142,7 @@ projects/shared/dist/src/random.d.ts
   File is output of project reference source 'projects/shared/src/random.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -259,7 +265,7 @@ export {};
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"2292560907-export declare function log(str: string): void;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"2292560907-export declare function log(str: string): void;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -365,9 +371,31 @@ export {};
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1344
+  "size": 1385
 }
 
 
@@ -457,12 +485,7 @@ Program files::
 /home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
 /home/src/workspaces/solution/projects/server/src/server.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
-/home/src/workspaces/solution/projects/shared/dist/src/myClass.d.ts
-/home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
-/home/src/workspaces/solution/projects/server/src/server.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -610,7 +633,7 @@ Before running Timeout callback:: count: 1
 Host is moving to new time
 After running Timeout callback:: count: 0
 Output::
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because output 'projects/server/dist/server/tsconfig.tsbuildinfo' is older than input 'projects/shared/src/logging.ts'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -625,6 +648,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -639,12 +668,12 @@ projects/shared/dist/src/random.d.ts
   File is output of project reference source 'projects/shared/src/random.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../../shared/dist/src/random.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n","-1751303682-export declare function randomFn(str: string): void;\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,5]],"resolvedRoot":[[2,6],[3,7],[4,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[5,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -750,9 +779,31 @@ projects/server/src/server.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1375
+  "size": 1416
 }
 
 
@@ -815,8 +866,7 @@ Program files::
 /home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
 /home/src/workspaces/solution/projects/server/src/server.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts (used version)
@@ -949,7 +999,7 @@ Before running Timeout callback:: count: 1
 Host is moving to new time
 After running Timeout callback:: count: 0
 Output::
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that file 'projects/shared/src/random.ts' was root file of compilation but not any more.
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -964,6 +1014,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/logging.d.ts
@@ -975,12 +1031,12 @@ projects/shared/dist/src/myClass.d.ts
   File is output of project reference source 'projects/shared/src/myClass.ts'
 projects/server/src/server.ts
   Matched by include pattern 'src/**/*.ts' in 'projects/server/tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,4]],"resolvedRoot":[[2,5],[3,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[4,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"}],"root":[[2,4]],"resolvedRoot":[[2,5],[3,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1069,9 +1125,27 @@ projects/server/src/server.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1229
+  "size": 1268
 }
 
 
@@ -1128,7 +1202,7 @@ Program files::
 /home/src/workspaces/solution/projects/shared/dist/src/myClass.d.ts
 /home/src/workspaces/solution/projects/server/src/server.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project.js b/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project.js
index 6c8565c84a4b8..96321bcb805d2 100644
--- a/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project.js
+++ b/tests/baselines/reference/tsbuildWatch/roots/when-root-file-is-from-referenced-project.js
@@ -122,6 +122,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -136,7 +142,7 @@ projects/shared/dist/src/logging.d.ts
 projects/shared/dist/src/random.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/random.ts'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -259,7 +265,7 @@ export {};
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"2292560907-export declare function log(str: string): void;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"2292560907-export declare function log(str: string): void;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -365,9 +371,31 @@ export {};
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1344
+  "size": 1385
 }
 
 
@@ -457,12 +485,7 @@ Program files::
 /home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
 /home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/workspaces/solution/projects/shared/dist/src/myClass.d.ts
-/home/src/workspaces/solution/projects/server/src/server.ts
-/home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
-/home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -610,7 +633,7 @@ Before running Timeout callback:: count: 1
 Host is moving to new time
 After running Timeout callback:: count: 0
 Output::
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because output 'projects/server/dist/server/tsconfig.tsbuildinfo' is older than input 'projects/shared/src/logging.ts'
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -625,6 +648,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -639,12 +668,12 @@ projects/shared/dist/src/logging.d.ts
 projects/shared/dist/src/random.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/random.ts'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/dist/src/random.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts","../../../shared/src/random.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n","-1751303682-export declare function randomFn(str: string): void;\n"],"root":[[2,5]],"resolvedRoot":[[4,6],[2,7],[5,8]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4,5],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -750,9 +779,31 @@ projects/shared/dist/src/random.d.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/random.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1375
+  "size": 1416
 }
 
 
@@ -815,8 +866,7 @@ Program files::
 /home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
 /home/src/workspaces/solution/projects/shared/dist/src/random.d.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts (used version)
@@ -949,7 +999,7 @@ Before running Timeout callback:: count: 1
 Host is moving to new time
 After running Timeout callback:: count: 0
 Output::
-[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that file 'projects/shared/src/random.ts' was root file of compilation but not any more.
+[HH:MM:SS AM] Project 'projects/server/tsconfig.json' is out of date because buildinfo file 'projects/server/dist/server/tsconfig.tsbuildinfo' indicates that program needs to report errors.
 
 [HH:MM:SS AM] Building project '/home/src/workspaces/solution/projects/server/tsconfig.json'...
 
@@ -964,6 +1014,12 @@ Loading module as file / folder, candidate module location '/home/src/workspaces
 File name '/home/src/workspaces/solution/projects/shared/src/myClass.js' has a '.js' extension - stripping it.
 File '/home/src/workspaces/solution/projects/shared/src/myClass.ts' exists - use it as a name resolution result.
 ======== Module name ':shared/myClass.js' was successfully resolved to '/home/src/workspaces/solution/projects/shared/src/myClass.ts'. ========
+projects/server/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./src",
+      ~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 projects/shared/dist/src/myClass.d.ts
@@ -975,12 +1031,12 @@ projects/server/src/server.ts
 projects/shared/dist/src/logging.d.ts
   Matched by include pattern '../shared/src/**/*.ts' in 'projects/server/tsconfig.json'
   File is output of project reference source 'projects/shared/src/logging.ts'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../../tslibs/ts/lib/lib.d.ts","../../../shared/dist/src/myclass.d.ts","../../src/server.ts","../../../shared/dist/src/logging.d.ts","../../../shared/src/logging.ts","../../../shared/src/myclass.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-7943199723-export declare class MyClass {\n}\n",{"version":"-19159694382-import { MyClass } from ':shared/myClass.js';\nconsole.log('Hello, world!');\n","signature":"-3531856636-export {};\n"},"-4937597761-export declare function log(str: string): void;\nexport declare const x = 10;\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"outDir":"..","rootDir":"../../.."},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./src/server.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/solution/projects/server/dist/server/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1069,9 +1125,27 @@ projects/shared/dist/src/logging.d.ts
       "../../../shared/dist/src/myclass.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/myclass.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../src/server.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../../shared/dist/src/logging.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./src/server.d.ts",
   "version": "FakeTSVersion",
-  "size": 1229
+  "size": 1268
 }
 
 
@@ -1128,7 +1202,7 @@ Program files::
 /home/src/workspaces/solution/projects/server/src/server.ts
 /home/src/workspaces/solution/projects/shared/dist/src/logging.d.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
diff --git a/tests/baselines/reference/tsc/composite/converting-to-modules.js b/tests/baselines/reference/tsc/composite/converting-to-modules.js
index a3dac335c0729..7102e3d266850 100644
--- a/tests/baselines/reference/tsc/composite/converting-to-modules.js
+++ b/tests/baselines/reference/tsc/composite/converting-to-modules.js
@@ -48,13 +48,7 @@ declare const x = 10;
 
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./src/main.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./src/main.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -105,13 +99,7 @@ declare const x = 10;
   ],
   "latestChangedDtsFile": "./src/main.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 788
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 748
-=======
-  "size": 783
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 823
 }
 
 
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 72699d5989a09..eccb650ad0670 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
@@ -82,13 +82,7 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
 
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../tslibs/ts/lib/lib.d.ts","./ky.d.ts","./src/index.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/project/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -144,13 +138,7 @@ define("src/index", ["require", "exports", "ky"], function (require, exports, ky
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1132
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1092
-=======
-  "size": 1129
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1169
 }
 
 
diff --git a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
index cba4c6f8f2a41..c700d511a2150 100644
--- a/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
+++ b/tests/baselines/reference/tsc/declarationEmit/when-using-Windows-paths-and-uppercase-letters.js
@@ -96,7 +96,14 @@ declare const console: { log(msg: any): void; };
 
 D:\home\src\tslibs\TS\Lib\tsc.js -p D:\Work\pkg1 --explainFiles
 Output::
+tsconfig.json:14:5 - 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.
+
+14     "baseUrl": "./",
+       ~~~~~~~~~
+
 tsconfig.json:21: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.
 
 21     "moduleResolution": "node",
                            ~~~~~~
@@ -112,7 +119,7 @@ src/utils/index.ts
 src/main.ts
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in tsconfig.json:21
+Found 2 errors in the same file, starting at: tsconfig.json:14
 
 
 
diff --git a/tests/baselines/reference/tsc/extends/configDir-template-with-commandline.js b/tests/baselines/reference/tsc/extends/configDir-template-with-commandline.js
index 8bcc4a439e096..d53e16f52e4f8 100644
--- a/tests/baselines/reference/tsc/extends/configDir-template-with-commandline.js
+++ b/tests/baselines/reference/tsc/extends/configDir-template-with-commandline.js
@@ -133,6 +133,12 @@ File '/home/src/projects/myproject/root2/other/sometype2/package.json' does not
 File '/home/src/projects/myproject/root2/other/sometype2/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/index.d.ts', result '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'.
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -143,6 +149,9 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/myproject/${configDir}/outDir/types/sometype.js]
@@ -181,4 +190,4 @@ export declare const z = 10;
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
diff --git a/tests/baselines/reference/tsc/extends/configDir-template.js b/tests/baselines/reference/tsc/extends/configDir-template.js
index 2550454de90b5..8b383fb2aacbb 100644
--- a/tests/baselines/reference/tsc/extends/configDir-template.js
+++ b/tests/baselines/reference/tsc/extends/configDir-template.js
@@ -133,6 +133,12 @@ File '/home/src/projects/myproject/root2/other/sometype2/package.json' does not
 File '/home/src/projects/myproject/root2/other/sometype2/index.d.ts' exists - use it as a name resolution result.
 Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/index.d.ts', result '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'.
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -143,6 +149,9 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
+
+Found 1 error in tsconfig.json:3
+
 
 
 //// [/home/src/projects/myproject/outDir/types/sometype.js]
@@ -181,4 +190,4 @@ export declare const z = 10;
 
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
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 17bd25aadb4bd..ffc2a423e5f70 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
@@ -79,13 +79,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -144,13 +138,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 882
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 842
-=======
-  "size": 883
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 923
 }
 
 
@@ -226,13 +214,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -292,13 +274,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 899
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 859
-=======
-  "size": 900
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 940
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -378,13 +354,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -443,13 +413,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 882
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 842
-=======
-  "size": 883
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 923
 }
 
 
@@ -496,13 +460,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -562,13 +520,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 901
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 861
-=======
-  "size": 902
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 942
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -631,13 +583,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -698,13 +644,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 923
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 883
-=======
-  "size": 924
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 964
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -846,13 +786,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -911,13 +845,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 883
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 843
-=======
-  "size": 884
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 924
 }
 
 
@@ -964,13 +892,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1031,13 +953,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 925
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 965
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
@@ -1160,13 +1076,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1226,13 +1136,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 906
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 866
-=======
-  "size": 907
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 947
 }
 
 
@@ -1309,13 +1213,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1375,13 +1273,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 900
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 860
-=======
-  "size": 901
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 941
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1461,13 +1353,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1526,13 +1412,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 883
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 843
-=======
-  "size": 884
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 924
 }
 
 
@@ -1579,13 +1459,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1646,13 +1520,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 925
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 965
 }
 
 //// [/home/src/workspaces/outFile.d.ts] file written with same contents
diff --git a/tests/baselines/reference/tsc/incremental/outFile/different-options.js b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
index 402ae9bfc7213..7bdde69308bd2 100644
--- a/tests/baselines/reference/tsc/incremental/outFile/different-options.js
+++ b/tests/baselines/reference/tsc/incremental/outFile/different-options.js
@@ -94,13 +94,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -162,13 +156,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -244,13 +232,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -313,13 +295,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1199
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1159
-=======
-  "size": 1200
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1240
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -399,13 +375,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -467,13 +437,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -622,13 +586,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -692,13 +650,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1223
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1183
-=======
-  "size": 1224
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1264
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map]
@@ -765,13 +717,7 @@ declare module "d" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -833,13 +779,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1182
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1142
-=======
-  "size": 1183
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1223
 }
 
 
@@ -1005,13 +945,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1073,13 +1007,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1183
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1143
-=======
-  "size": 1184
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1224
 }
 
 
@@ -1199,13 +1127,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0RmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInByb2plY3QvYS50cyIsInByb2plY3QvYi50cyIsInByb2plY3QvYy50cyIsInByb2plY3QvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQWEsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDOzs7Ozs7SUNBMUIsUUFBQSxDQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUEsTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDOzs7Ozs7SUNBRCxRQUFBLENBQUMsR0FBRyxLQUFDLENBQUM7Ozs7OztJQ0FOLFFBQUEsQ0FBQyxHQUFHLEtBQUMsQ0FBQyJ9
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1268,13 +1190,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1206
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1166
-=======
-  "size": 1207
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1247
 }
 
 
@@ -1351,13 +1267,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1420,13 +1330,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1200
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1160
-=======
-  "size": 1201
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1241
 }
 
 //// [/home/src/workspaces/outFile.js.map]
@@ -1531,13 +1435,7 @@ declare module "d" {
 //# sourceMappingURL=outFile.d.ts.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1600,13 +1498,7 @@ declare module "d" {
   "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",
-<<<<<<< HEAD
-  "size": 1205
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1165
-=======
-  "size": 1206
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1246
 }
 
 //// [/home/src/workspaces/outFile.d.ts.map] file written with same contents
@@ -1684,13 +1576,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
 //# sourceMappingURL=outFile.js.map
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1754,13 +1640,7 @@ define("d", ["require", "exports", "b"], function (require, exports, b_1) {
   "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",
-<<<<<<< HEAD
-  "size": 1222
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1182
-=======
-  "size": 1223
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1263
 }
 
 //// [/home/src/workspaces/outFile.js.map] file written with same contents
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 dd8ff261d4906..bb476183eccd6 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,128 +1,4 @@
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../../../tslibs/ts/lib/lib.d.ts": {
-      "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
-*** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+*** Supplied discrepancy explanation but didnt find any difference
\ 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 6acd0d9e16678..ea4534f2d850a 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
@@ -72,541 +72,7 @@ declare class class2 {
 
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "../project1/class1.d.ts",
-    "./class2.ts"
-  ],
-  "fileInfos": {
-    "../../../tslibs/ts/lib/lib.d.ts": {
-      "original": {
-        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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",
-  "version": "FakeTSVersion",
-  "size": 894
-}
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Add class3 to project1 and build it
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.ts]
-class class3 {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
-  The file is in the program because:
-    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
-
-  project2/tsconfig.json:7:5
-    7     {
-          ~
-    8       "path": "../project1"
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    9     }
-      ~~~~~
-    File is output from referenced project specified here.
-
-
-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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 908
-}
-
-
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
-
-Change:: Add output of class3
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.d.ts]
-declare class class3 {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-
-
-//// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "../project1/class1.d.ts",
-    "../project1/class3.d.ts",
-    "./class2.ts"
-  ],
-  "fileInfos": {
-    "../../../tslibs/ts/lib/lib.d.ts": {
-      "original": {
-        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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
-    },
-    "../project1/class3.d.ts": {
-      "original": {
-        "version": "-3469165364-declare class class3 {}",
-        "affectsGlobalScope": true
-      },
-      "version": "-3469165364-declare class class3 {}",
-      "signature": "-3469165364-declare class class3 {}",
-      "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": [
-    [
-      4,
-      "./class2.ts"
-    ]
-  ],
-  "options": {
-    "composite": true,
-    "module": 0
-  },
-  "latestChangedDtsFile": "./class2.d.ts",
-  "version": "FakeTSVersion",
-  "size": 996
-}
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Add excluded file to project1
-
-Input::
-//// [/home/src/workspaces/projects/project1/temp/file.d.ts]
-declare class file {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Delete output for class3
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.d.ts] deleted
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
-  The file is in the program because:
-    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
-
-  project2/tsconfig.json:7:5
-    7     {
-          ~
-    8       "path": "../project1"
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    9     }
-      ~~~~~
-    File is output from referenced project specified here.
-
-
-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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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]
-{
-  "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",
-  "version": "FakeTSVersion",
-  "size": 854
-}
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Add class3 to project1 and build it
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.ts]
-class class3 {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
-  The file is in the program because:
-    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
-
-  project2/tsconfig.json:7:5
-    7     {
-          ~
-    8       "path": "../project1"
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    9     }
-      ~~~~~
-    File is output from referenced project specified here.
-
-
-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
-
-Change:: Add output of class3
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.d.ts]
-declare class class3 {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-
-
-//// [/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},"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
-
-//// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
-{
-  "fileNames": [
-    "../../../tslibs/ts/lib/lib.d.ts",
-    "../project1/class1.d.ts",
-    "../project1/class3.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
-    },
-    "../project1/class3.d.ts": {
-      "original": {
-        "version": "-3469165364-declare class class3 {}",
-        "affectsGlobalScope": true
-      },
-      "version": "-3469165364-declare class class3 {}",
-      "signature": "-3469165364-declare class class3 {}",
-      "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": [
-    [
-      4,
-      "./class2.ts"
-    ]
-  ],
-  "options": {
-    "composite": true,
-    "module": 0
-  },
-  "latestChangedDtsFile": "./class2.d.ts",
-  "version": "FakeTSVersion",
-  "size": 956
-}
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Add excluded file to project1
-
-Input::
-//// [/home/src/workspaces/projects/project1/temp/file.d.ts]
-declare class file {}
-
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-
-
-
-exitCode:: ExitStatus.Success
-
-Change:: Delete output for class3
-
-Input::
-//// [/home/src/workspaces/projects/project1/class3.d.ts] deleted
-
-/home/src/tslibs/TS/Lib/tsc.js -i -p project2
-Output::
-error TS6053: File '/home/src/workspaces/projects/project1/class3.d.ts' not found.
-  The file is in the program because:
-    Output from referenced project '/home/src/workspaces/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
-
-  project2/tsconfig.json:7:5
-    7     {
-          ~
-    8       "path": "../project1"
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    9     }
-      ~~~~~
-    File is output from referenced project specified here.
-
-
-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":[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":[1,2,3],"latestChangedDtsFile":"./class2.d.ts","version":"FakeTSVersion"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -671,13 +137,7 @@ Found 1 error.
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 929
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 889
-=======
-  "size": 891
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 931
 }
 
 
@@ -739,13 +199,7 @@ 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]
-<<<<<<< HEAD
-{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -824,13 +278,7 @@ Found 1 error in project2/tsconfig.json:3
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 996
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 956
-=======
-  "size": 995
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1035
 }
 
 
@@ -890,7 +338,7 @@ Found 2 errors in the same file, starting at: 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","./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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -902,11 +350,11 @@ Found 2 errors in the same file, starting at: project2/tsconfig.json:3
   "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; };",
+        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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; };",
+      "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": {
@@ -955,7 +403,7 @@ Found 2 errors in the same file, starting at: project2/tsconfig.json:3
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 891
+  "size": 931
 }
 
 
@@ -982,7 +430,7 @@ 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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -995,11 +443,11 @@ Found 1 error in project2/tsconfig.json:3
   "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; };",
+        "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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; };",
+      "version": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": {
@@ -1061,7 +509,7 @@ Found 1 error in project2/tsconfig.json:3
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-  "size": 995
+  "size": 1035
 }
 
 
diff --git a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
index 3226c9a4ca01e..864169fd57506 100644
--- a/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
+++ b/tests/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js
@@ -332,10 +332,17 @@ Directory '/home/node_modules' does not exist, skipping all lookups in it.
 Directory '/node_modules' does not exist, skipping all lookups in it.
 ======== Module name '@typescript/lib-es5' was not resolved. ========
 tsconfig.json:8: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.
 
 8     "moduleResolution": "node",
                           ~~~~~~
 
+tsconfig.json:9:5 - 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.
+
+9     "baseUrl": ".",
+      ~~~~~~~~~
+
 ../../../../tslibs/TS/Lib/lib.es5.d.ts
   Library 'lib.es5.d.ts' specified in compilerOptions
 ../../node_modules/.pnpm/@component-type-checker+button@0.0.1/node_modules/@component-type-checker/button/src/index.ts
@@ -352,7 +359,7 @@ Directory '/node_modules' does not exist, skipping all lookups in it.
 src/app.tsx
   Matched by include pattern 'src' in 'tsconfig.json'
 
-Found 1 error in tsconfig.json:8
+Found 2 errors in the same file, starting at: tsconfig.json:8
 
 
 
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 c0e5bb509eb0a..db54e7badaee7 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,232 +1,8 @@
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
 *** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
-*** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+*** Supplied discrepancy explanation but didnt find any difference
\ 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 54c4154d91714..c1ca99fdf3c00 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
@@ -403,13 +403,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -453,13 +447,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -543,7 +531,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -553,7 +541,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -588,7 +576,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 734
+  "size": 774
 }
 
 
@@ -849,13 +837,7 @@ Errors  Files
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -922,13 +904,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 
@@ -1081,13 +1057,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1131,13 +1101,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -1205,13 +1169,7 @@ define("c", ["require", "exports"], function (require, exports) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1264,13 +1222,7 @@ define("c", ["require", "exports"], function (require, exports) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 //// [/home/src/workspaces/outFile.d.ts]
@@ -1620,13 +1572,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1679,13 +1625,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1731,7 +1671,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1742,7 +1682,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1785,7 +1725,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 805
+  "size": 845
 }
 
 
@@ -1832,7 +1772,7 @@ 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],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1843,7 +1783,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1885,7 +1825,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 825
 }
 
 
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 c0e5bb509eb0a..db54e7badaee7 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,232 +1,8 @@
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
 *** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
-*** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+*** Supplied discrepancy explanation but didnt find any difference
\ 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 80afd23c063e7..6fb617345add5 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
@@ -344,13 +344,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -394,13 +388,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -484,7 +472,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -494,7 +482,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -529,7 +517,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 734
+  "size": 774
 }
 
 
@@ -718,13 +706,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -768,13 +750,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 722
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 762
 }
 
 
@@ -921,13 +897,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -971,13 +941,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -1057,13 +1021,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1116,13 +1074,7 @@ declare module "c" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1402,13 +1354,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1461,13 +1407,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1513,7 +1453,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1524,7 +1464,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1567,7 +1507,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 805
+  "size": 845
 }
 
 
@@ -1614,7 +1554,7 @@ 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],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1625,7 +1565,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1667,7 +1607,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 825
 }
 
 
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 c0e5bb509eb0a..db54e7badaee7 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,232 +1,8 @@
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
 *** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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
-<<<<<<< HEAD
-TsBuild info text without affectedFilesPendingEmit:: /home/src/workspaces/outfile.tsbuildinfo.readable.baseline.txt::
-CleanBuild:
-{
-  "fileInfos": {
-    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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"
-}
-=======
-*** Supplied discrepancy explanation but didnt find any difference
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+*** Supplied discrepancy explanation but didnt find any difference
\ 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 9c68724646388..b89035163d5f7 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
@@ -350,13 +350,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -400,13 +394,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -490,7 +478,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -500,7 +488,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -535,7 +523,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 734
+  "size": 774
 }
 
 
@@ -927,13 +915,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -977,13 +959,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 
@@ -1063,13 +1039,7 @@ declare module "c" {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1122,13 +1092,7 @@ declare module "c" {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1426,13 +1390,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1485,13 +1443,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 938
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 898
-=======
-  "size": 785
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 825
 }
 
 
@@ -1537,7 +1489,7 @@ 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"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1548,7 +1500,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1591,7 +1543,7 @@ Found 1 error in tsconfig.json:5
   ],
   "checkPending": true,
   "version": "FakeTSVersion",
-  "size": 805
+  "size": 845
 }
 
 
@@ -1638,7 +1590,7 @@ 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],"version":"FakeTSVersion"}
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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]
 {
@@ -1649,7 +1601,7 @@ Found 1 error in tsconfig.json:5
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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\";"
@@ -1691,7 +1643,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 785
+  "size": 825
 }
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
index 81d3a68005afc..fc36018e8e605 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-composite.js
@@ -129,13 +129,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -211,13 +205,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
@@ -283,13 +271,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -338,13 +320,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2653
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2613
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -373,13 +349,7 @@ Found 1 error in tsconfig.json:5
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -455,13 +425,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
@@ -629,13 +593,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -711,13 +669,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2635
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2595
-=======
-  "size": 1849
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1889
 }
 
 
@@ -821,13 +773,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -876,13 +822,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2074
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2034
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -969,13 +909,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1051,13 +985,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 
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 422d25bf0081d..58492b9f0ec9a 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental-declaration.js
@@ -130,13 +130,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -210,13 +204,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
@@ -282,13 +270,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -335,13 +317,7 @@ Found 1 error in tsconfig.json:6
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2104
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2064
-=======
-  "size": 1273
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1313
 }
 
 
@@ -371,13 +347,7 @@ Found 1 error in tsconfig.json:6
 //// [/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]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -451,13 +421,7 @@ Found 1 error in tsconfig.json:6
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
@@ -625,13 +589,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -705,13 +663,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2084
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2044
-=======
-  "size": 1298
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1338
 }
 
 
@@ -815,13 +767,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -868,13 +814,7 @@ Found 1 error in tsconfig.json:6
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1271
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1311
 }
 
 
@@ -961,13 +901,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1041,13 +975,7 @@ declare function someFunc(arguments: boolean, ...rest: any[]): void;
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 
diff --git a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
index fc13f12fc20ff..ed6d5de5330b1 100644
--- a/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
+++ b/tests/baselines/reference/tsc/noEmit/outFile/changes-incremental.js
@@ -109,13 +109,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -188,13 +182,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
@@ -260,13 +248,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -312,13 +294,7 @@ Found 1 error in tsconfig.json:5
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2085
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2045
-=======
-  "size": 1254
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1294
 }
 
 
@@ -347,13 +323,7 @@ Found 1 error in tsconfig.json:5
 
 //// [/home/src/workspaces/outFile.js] file written with same contents
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -426,13 +396,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
@@ -580,13 +544,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -659,13 +617,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2065
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2025
-=======
-  "size": 1279
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1319
 }
 
 
@@ -769,13 +721,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -821,13 +767,7 @@ Found 1 error in tsconfig.json:5
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1252
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1292
 }
 
 
@@ -894,13 +834,7 @@ function someFunc(arguments, ...rest) {
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -973,13 +907,7 @@ function someFunc(arguments, ...rest) {
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 
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 d949d14495608..87f0de885e39d 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
@@ -65,13 +65,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -124,13 +118,7 @@ Found 1 error in tsconfig.json:5
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1521
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1481
-=======
-  "size": 1281
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1321
 }
 
 
@@ -153,13 +141,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -235,13 +217,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -333,13 +309,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -415,13 +385,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2635
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2595
-=======
-  "size": 1849
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1889
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -513,13 +477,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -568,13 +526,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2074
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2034
-=======
-  "size": 1822
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1862
 }
 
 
@@ -597,13 +549,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -679,13 +625,7 @@ Found 1 error in tsconfig.json:5
   "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",
-<<<<<<< HEAD
-  "size": 2055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2015
-=======
-  "size": 1845
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1885
 }
 
 //// [/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 5812c39b84c40..3bc7c3f4b4b51 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
@@ -66,13 +66,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -125,13 +119,7 @@ Found 1 error in tsconfig.json:6
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1283
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1323
 }
 
 
@@ -154,13 +142,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -234,13 +216,7 @@ Found 1 error in tsconfig.json:6
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -332,13 +308,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -412,13 +382,7 @@ Found 1 error in tsconfig.json:6
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2084
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2044
-=======
-  "size": 1298
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1338
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -510,13 +474,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -563,13 +521,7 @@ Found 1 error in tsconfig.json:6
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1523
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1483
-=======
-  "size": 1271
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1311
 }
 
 
@@ -592,13 +544,7 @@ Found 1 error in tsconfig.json:6
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -672,13 +618,7 @@ Found 1 error in tsconfig.json:6
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1506
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1466
-=======
-  "size": 1296
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1336
 }
 
 //// [/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 063d6825e4733..330cf06751d85 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
@@ -65,13 +65,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -123,13 +117,7 @@ Found 1 error in tsconfig.json:5
     "./project/src/nochangefilewithemitspecificerror.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1264
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1304
 }
 
 
@@ -152,13 +140,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -231,13 +213,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -309,13 +285,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -388,13 +358,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 2065
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 2025
-=======
-  "size": 1279
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1319
 }
 
 //// [/home/src/workspaces/outFile.js]
@@ -466,13 +430,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -518,13 +476,7 @@ Found 1 error in tsconfig.json:5
     "./project/src/class.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 1252
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1292
 }
 
 
@@ -547,13 +499,7 @@ Found 1 error in tsconfig.json:5
 
 
 //// [/home/src/workspaces/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"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":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/workspaces/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -626,13 +572,7 @@ Found 1 error in tsconfig.json:5
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1487
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1447
-=======
-  "size": 1277
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1317
 }
 
 //// [/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 9fd1cba970c4d..6311e731a5a1b 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
@@ -50,13 +50,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -100,13 +94,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 885
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 845
-=======
-  "size": 853
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 893
 }
 
 
@@ -200,13 +188,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -251,13 +233,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1765
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1725
-=======
-  "size": 872
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 912
 }
 
 
@@ -307,13 +283,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -359,13 +329,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1787
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1747
-=======
-  "size": 894
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 934
 }
 
 
@@ -496,13 +460,7 @@ Errors  Files
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -627,13 +585,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1748
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1708
-=======
-  "size": 1749
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1789
 }
 
 //// [/home/src/projects/outFile.js]
@@ -727,13 +679,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -822,13 +768,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -869,13 +809,7 @@ Found 1 error in tsconfig.json:4
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1485
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1445
-=======
-  "size": 863
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 903
 }
 
 
@@ -925,13 +859,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -973,13 +901,7 @@ Found 1 error in tsconfig.json:4
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1507
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1467
-=======
-  "size": 885
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 925
 }
 
 
@@ -1033,13 +955,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts","./project/c.ts","./project/d.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -1082,13 +998,7 @@ Found 1 error in tsconfig.json:4
     "./project/c.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1227
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1187
-=======
-  "size": 886
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 926
 }
 
 
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
index c31c43cffeb6f..40828c959d4dc 100644
--- 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
@@ -8,7 +8,7 @@ Incremental buildInfoText:: {
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -65,7 +65,7 @@ Incremental buildInfoText:: {
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1035
+  "size": 1075
 }
 Clean buildInfoText:: {
   "fileNames": [
@@ -74,7 +74,7 @@ Clean buildInfoText:: {
     "./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; };",
+    "../tslibs/ts/lib/lib.d.ts": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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;"
   },
@@ -99,5 +99,5 @@ Clean buildInfoText:: {
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-  "size": 716
+  "size": 756
 }
\ 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 12185c238fd28..8d073ec23af04 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
@@ -45,13 +45,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -86,13 +80,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 716
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 756
 }
 
 
@@ -183,13 +171,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -224,13 +206,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 734
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 694
-=======
-  "size": 701
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 741
 }
 
 
@@ -318,13 +294,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -368,13 +338,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 //// [/home/src/projects/outFile.js]
@@ -488,13 +452,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -527,13 +485,7 @@ Found 1 error in tsconfig.json:4
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 712
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 752
 }
 
 
@@ -592,13 +544,7 @@ Errors  Files
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -665,13 +611,7 @@ Errors  Files
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 //// [/home/src/projects/outFile.js]
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 531a925b545ef..349a76d2f896c 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
@@ -44,13 +44,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -84,13 +78,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 733
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 693
-=======
-  "size": 697
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 737
 }
 
 
@@ -179,13 +167,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -219,13 +201,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -311,13 +287,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -360,13 +330,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -469,13 +433,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -552,13 +510,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -601,13 +553,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 713
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 673
-=======
-  "size": 710
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 750
 }
 
 //// [/home/src/projects/outFile.js]
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 5b1e7be91b84f..157572929cfd7 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
@@ -44,13 +44,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -84,13 +78,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 689
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 729
 }
 
 
@@ -179,13 +167,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -219,13 +201,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -311,13 +287,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -360,13 +330,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -469,13 +433,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -507,13 +465,7 @@ Found 1 error in tsconfig.json:4
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 685
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 725
 }
 
 
@@ -558,13 +510,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -607,13 +553,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 857
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 817
-=======
-  "size": 702
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 742
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
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 09dfd4fe57533..7f00005fa8416 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
@@ -167,13 +167,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -207,13 +201,7 @@ Found 1 error in tsconfig.json:4
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -299,13 +287,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -348,13 +330,7 @@ Found 1 error in tsconfig.json:4
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
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 f6b3c1da95e16..1bc676bdbee18 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
@@ -56,13 +56,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -103,13 +97,7 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1274
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1234
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 
@@ -208,13 +196,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -255,101 +237,9 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 943
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 903
-=======
-  "size": 937
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 977
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 6faf8d1107cab..5f6cf2f766e88 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
@@ -125,91 +125,6 @@ export const a = class { p = 10; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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 {};
-}
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -218,7 +133,6 @@ declare module "src/other" {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 b3c9812d6ef04..173978209b5e3 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
@@ -44,55 +44,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -101,17 +52,10 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -151,13 +95,7 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 926
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 966
 }
 
 
@@ -254,13 +192,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -300,13 +232,7 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 918
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 958
 }
 
 
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
index 209dd57083743..70e2a876c9c0c 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/dts-errors.js
@@ -43,55 +43,6 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -100,7 +51,6 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 d8fd2a45210d1..d91a1aa3bf1ee 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
@@ -223,13 +223,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -270,77 +264,9 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 935
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 895
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 2ef8f159dc6d6..194f402a0d05e 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
@@ -139,67 +139,6 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const 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 {};
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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 {};
-}
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -208,7 +147,6 @@ declare module "src/other" {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 cdde2e28ac3dd..4cc0fb98bc049 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
@@ -219,13 +219,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -265,53 +259,9 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 910
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 950
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
index 07a20ada288d3..76913996db905 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/semantic-errors.js
@@ -136,43 +136,6 @@ const a: string = "hello";
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -181,7 +144,6 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 c37c05e33f5df..f1be87a377aba 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
@@ -215,13 +215,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -262,81 +256,9 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 944
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 904
-=======
-  "size": 938
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 978
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
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 2528750c24d58..0c0fa5efa85cb 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
@@ -144,71 +144,6 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const 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 {};
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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 {};
-}
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -217,7 +152,6 @@ declare module "src/other" {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 80c277ef96494..3aeca67cce59e 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
@@ -211,13 +211,7 @@ Found 1 error in tsconfig.json:4
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -257,57 +251,9 @@ Found 1 error in tsconfig.json:4
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 925
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 885
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 Program root files: [
   "/user/username/projects/noEmitOnError/shared/types/db.ts",
diff --git a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
index a204704629398..63e977727c93d 100644
--- a/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
+++ b/tests/baselines/reference/tsc/noEmitOnError/outFile/syntax-errors.js
@@ -141,47 +141,6 @@ const a = {
 
 /home/src/tslibs/TS/Lib/tsc.js 
 Output::
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
 tsconfig.json:4:15 - error TS5107: Option 'module=AMD' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
 
 4     "module": "amd",
@@ -190,7 +149,6 @@ define("src/other", ["require", "exports"], function (require, exports) {
 
 Found 1 error in tsconfig.json:4
 
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
diff --git a/tests/baselines/reference/tsc/projectReferencesConfig/issues-a-nice-error-when-the-input-file-is-missing-when-module-reference-is-not-relative.js b/tests/baselines/reference/tsc/projectReferencesConfig/issues-a-nice-error-when-the-input-file-is-missing-when-module-reference-is-not-relative.js
index 2a39b295bcd0a..d749165ea8fad 100644
--- a/tests/baselines/reference/tsc/projectReferencesConfig/issues-a-nice-error-when-the-input-file-is-missing-when-module-reference-is-not-relative.js
+++ b/tests/baselines/reference/tsc/projectReferencesConfig/issues-a-nice-error-when-the-input-file-is-missing-when-module-reference-is-not-relative.js
@@ -52,13 +52,14 @@ declare const console: { log(msg: any): void; };
 
 /home/src/tslibs/TS/Lib/tsc.js --p beta/tsconfig.json
 Output::
-beta/b.ts:1:19 - error TS6305: Output file '/home/src/workspaces/project/alpha/bin/a.d.ts' has not been built from source file '/home/src/workspaces/project/alpha/a.ts'.
+beta/tsconfig.json:5:5 - 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.
 
-1 import { m } from '@alpha/a'
-                    ~~~~~~~~~~
+5     "baseUrl": "./",
+      ~~~~~~~~~
 
 
-Found 1 error in beta/b.ts:1
+Found 1 error in beta/tsconfig.json:5
 
 
 
@@ -72,7 +73,7 @@ export {};
 
 
 //// [/home/src/workspaces/project/beta/bin/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"2892088637-import { m } from '@alpha/a'","signature":"-3531856636-export {};\n"}],"root":[2],"options":{"composite":true,"outDir":"./"},"semanticDiagnosticsPerFile":[[2,[{"start":18,"length":10,"messageText":"Output file '/home/src/workspaces/project/alpha/bin/a.d.ts' has not been built from source file '/home/src/workspaces/project/alpha/a.ts'.","category":1,"code":6305}]]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../tslibs/ts/lib/lib.d.ts","../b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"2892088637-import { m } from '@alpha/a'","signature":"-3531856636-export {};\n"}],"root":[2],"options":{"composite":true,"outDir":"./"},"semanticDiagnosticsPerFile":[1,2],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/workspaces/project/beta/bin/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -110,22 +111,18 @@ export {};
     "outDir": "./"
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
     [
       "../b.ts",
-      [
-        {
-          "start": 18,
-          "length": 10,
-          "messageText": "Output file '/home/src/workspaces/project/alpha/bin/a.d.ts' has not been built from source file '/home/src/workspaces/project/alpha/a.ts'.",
-          "category": 1,
-          "code": 6305
-        }
-      ]
+      "not cached or not changed"
     ]
   ],
   "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-  "size": 1004
+  "size": 797
 }
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
index 79c75cf0e6720..5ae7dbd45b5dd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -162,7 +168,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -253,8 +259,38 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1404
+  "size": 1449
 }
 
 
@@ -302,14 +338,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -343,10 +372,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -359,7 +389,7 @@ Output::
 //// [/user/username/projects/myproject/lib2/public.js] file written with same contents
 //// [/user/username/projects/myproject/app.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -475,21 +505,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2163
+  "size": 1979
 }
 
 
@@ -514,13 +560,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -553,10 +593,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -565,7 +606,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -681,21 +722,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2161
+  "size": 1977
 }
 
 
@@ -720,9 +777,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -751,10 +806,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -763,7 +819,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -879,21 +935,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2163
+  "size": 1979
 }
 
 
@@ -918,9 +990,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
index 665ea5fef1f04..4829089081f2b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -205,14 +211,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -246,10 +245,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -282,13 +282,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -321,10 +315,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -353,9 +348,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -384,10 +377,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -416,9 +410,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
index c4eae345b8628..210567479a98b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -177,7 +183,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -278,8 +284,42 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1581
+  "size": 1628
 }
 
 
@@ -330,15 +370,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -373,10 +405,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -390,7 +423,7 @@ Output::
 //// [/user/username/projects/myproject/lib2/public.js] file written with same contents
 //// [/user/username/projects/myproject/app.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -520,21 +553,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2518
+  "size": 2336
 }
 
 
@@ -560,14 +613,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -601,10 +647,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -613,7 +660,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -743,21 +790,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2516
+  "size": 2334
 }
 
 
@@ -783,9 +850,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -814,10 +879,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -826,7 +892,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -956,21 +1022,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2518
+  "size": 2336
 }
 
 
@@ -996,9 +1082,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
index ddfbfe5cb1c61..42de1f16eb18c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -223,15 +229,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -266,10 +264,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -304,14 +303,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -345,10 +337,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -378,9 +371,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -409,10 +400,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -442,9 +434,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 97329d2cdf546..173271c0eab05 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -193,7 +199,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -309,8 +315,38 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1951
+  "size": 1996
 }
 
 
@@ -359,14 +395,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -400,7 +429,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -414,7 +449,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -530,8 +565,38 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1953
+  "size": 1998
 }
 
 
@@ -557,9 +622,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -588,7 +651,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -602,7 +671,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -718,8 +787,38 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1951
+  "size": 1996
 }
 
 
@@ -745,9 +844,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -776,7 +873,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -790,7 +893,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -906,8 +1009,38 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1953
+  "size": 1998
 }
 
 
@@ -933,9 +1066,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
index b322b02d7d1eb..056f9e986840e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -237,14 +243,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -278,7 +277,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -313,9 +318,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -344,7 +347,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -379,9 +388,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -410,7 +417,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -445,9 +458,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 6562935890d15..f759ccb95caff 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -217,7 +223,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -347,8 +353,42 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2306
+  "size": 2353
 }
 
 
@@ -400,15 +440,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -443,7 +475,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -457,7 +495,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -587,8 +625,42 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2308
+  "size": 2355
 }
 
 
@@ -615,9 +687,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -646,7 +716,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -660,7 +736,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -790,8 +866,42 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2306
+  "size": 2353
 }
 
 
@@ -818,9 +928,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -849,7 +957,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -863,7 +977,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"assumeChangesOnlyAffectDirectDependencies":true,"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -993,8 +1107,42 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2308
+  "size": 2355
 }
 
 
@@ -1021,9 +1169,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
index 603409a3bcc02..ded69dd05ef35 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -264,15 +270,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -307,7 +305,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -343,9 +347,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -374,7 +376,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -410,9 +418,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -441,7 +447,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -477,9 +489,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
index 5773e478b5ba1..59b408ac4a3d6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -162,7 +168,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -250,8 +256,38 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1343
+  "size": 1388
 }
 
 
@@ -298,14 +334,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -339,10 +368,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -355,7 +385,7 @@ Output::
 //// [/user/username/projects/myproject/lib2/public.js] file written with same contents
 //// [/user/username/projects/myproject/app.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -468,21 +498,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2102
+  "size": 1918
 }
 
 
@@ -506,13 +552,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -545,14 +585,20 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -648,8 +694,38 @@ Output::
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1508
+  "size": 1553
 }
 
 
@@ -673,13 +749,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -712,10 +782,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -724,7 +795,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -821,21 +892,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1739
+  "size": 1555
 }
 
 
@@ -859,13 +946,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
index c1eb6979b9b6d..cfa7160dd80d0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -204,14 +210,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -245,10 +244,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -280,13 +280,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -319,7 +313,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -345,13 +345,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -384,10 +378,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -415,13 +410,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
index 02abf5bb8ab4f..b33c7eced9a87 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -177,7 +183,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -275,8 +281,42 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1520
+  "size": 1567
 }
 
 
@@ -326,15 +366,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -369,10 +401,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -386,7 +419,7 @@ Output::
 //// [/user/username/projects/myproject/lib2/public.js] file written with same contents
 //// [/user/username/projects/myproject/app.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -513,21 +546,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2457
+  "size": 2275
 }
 
 
@@ -552,14 +605,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -593,14 +639,20 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -706,8 +758,42 @@ Output::
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1685
+  "size": 1732
 }
 
 
@@ -732,14 +818,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -773,10 +852,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -785,7 +865,7 @@ Output::
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/lib1/tools/public.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},"-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -892,21 +972,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1916
+  "size": 1734
 }
 
 
@@ -931,14 +1031,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
index 5a6d4c3446347..15d654aed53a9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -222,15 +228,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -265,10 +263,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -302,14 +301,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -343,7 +335,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -370,14 +368,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -411,10 +402,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -443,14 +435,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
index e10952de64477..9ad31f1c70063 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -193,7 +199,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -308,8 +314,38 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1902
+  "size": 1947
 }
 
 
@@ -357,14 +393,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -398,10 +427,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -421,7 +451,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -537,21 +567,37 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2133
+  "size": 1949
 }
 
 
@@ -576,13 +622,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -615,7 +655,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -633,7 +679,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -748,8 +794,38 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1902
+  "size": 1947
 }
 
 
@@ -774,13 +850,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -813,10 +883,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -836,7 +907,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -952,21 +1023,37 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2133
+  "size": 1949
 }
 
 
@@ -991,13 +1078,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
index a1a0422262165..d228ccb1e64d5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -236,14 +242,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -277,10 +276,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -320,13 +320,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -359,7 +353,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -397,13 +397,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -436,10 +430,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -479,13 +474,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index 47c73908d7b12..3d089fc73f86c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -217,7 +223,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -346,8 +352,42 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2257
+  "size": 2304
 }
 
 
@@ -398,15 +438,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -441,10 +473,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -465,7 +498,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -595,21 +628,41 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2488
+  "size": 2306
 }
 
 
@@ -635,14 +688,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -676,7 +722,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -695,7 +747,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -824,8 +876,42 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2257
+  "size": 2304
 }
 
 
@@ -851,14 +937,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -892,10 +971,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -916,7 +996,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1046,21 +1126,41 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2488
+  "size": 2306
 }
 
 
@@ -1086,14 +1186,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
index 9878e737ec259..4a18841dabb8a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -263,15 +269,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -306,10 +304,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -351,14 +350,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -392,7 +384,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -432,14 +430,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -473,10 +464,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -518,14 +510,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
index a40f6b0fc1c41..76949c84f817c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -162,7 +168,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -250,8 +256,38 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1343
+  "size": 1388
 }
 
 
@@ -299,14 +335,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -340,10 +369,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -351,7 +381,7 @@ Output::
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -444,21 +474,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1662
+  "size": 1478
 }
 
 
@@ -483,13 +529,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -522,13 +562,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -620,8 +666,38 @@ Output::
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1431
+  "size": 1476
 }
 
 
@@ -646,13 +722,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -685,10 +755,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -696,7 +767,7 @@ Output::
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[7],"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -789,21 +860,37 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1662
+  "size": 1478
 }
 
 
@@ -828,13 +915,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
index bee3ae8238b45..3d11d2183430c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -205,14 +211,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -246,10 +245,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -277,13 +277,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -316,7 +310,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -342,13 +342,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -381,10 +375,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -412,13 +407,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
index d9658494de463..b49980b9dced1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -177,7 +183,7 @@ exports.App = App;
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-4369626085-export interface ITest {\n    title: string;\n}","-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -275,8 +281,42 @@ exports.App = App;
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1520
+  "size": 1567
 }
 
 
@@ -327,15 +367,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -370,10 +402,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -381,7 +414,7 @@ Output::
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -484,21 +517,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1839
+  "size": 1657
 }
 
 
@@ -524,14 +577,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -565,13 +611,19 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -673,8 +725,42 @@ Output::
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1608
+  "size": 1655
 }
 
 
@@ -700,14 +786,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -741,10 +820,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -752,7 +832,7 @@ Output::
 
 //// [/user/username/projects/myproject/lib1/tools/toolsinterface.js] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},"-10750058173-export * from \"./toolsinterface\";","-5078933600-export * from \"./tools/public\";","-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","-9530042629-export * from \"./data\";","-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}"],"root":[8],"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -855,21 +935,41 @@ Output::
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 1839
+  "size": 1657
 }
 
 
@@ -895,14 +995,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
index 8d3fa3a0e2cdd..3a853a19b859e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -223,15 +229,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -266,10 +264,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -298,14 +297,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -339,7 +331,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -366,14 +364,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -407,10 +398,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -439,14 +431,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
index 10edf8e7f65bb..185d0c5478b02 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export-with-incremental.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -193,7 +199,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -308,8 +314,38 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1902
+  "size": 1947
 }
 
 
@@ -358,14 +394,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -399,10 +428,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -421,7 +451,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -537,21 +567,37 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2133
+  "size": 1949
 }
 
 
@@ -577,13 +623,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -616,7 +656,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -633,7 +679,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -748,8 +794,38 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 1902
+  "size": 1947
 }
 
 
@@ -775,13 +851,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -814,10 +884,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -836,7 +907,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[[5,[{"start":121,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[6],[3],[2],[4],[5]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-30573389178-import { ITest } from \"lib1/public\";\nexport class Data {\n    public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-15758516261-import { ITest } from \"lib1/public\";\nexport declare class Data {\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[7],"options":{"declaration":true},"referencedMap":[[7,1],[4,2],[3,3],[5,4],[6,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -952,21 +1023,37 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 121,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2133
+  "size": 1949
 }
 
 
@@ -992,13 +1079,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
index c0bc95ed682eb..3a22f46a47b6e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
@@ -64,7 +64,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -237,14 +243,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -278,10 +277,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -321,13 +321,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -360,7 +354,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -398,13 +398,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -437,10 +431,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -480,13 +475,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
index d2ff923b7eb77..df8ba17063d3e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports-with-incremental.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -217,7 +223,7 @@ export declare class App {
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -346,8 +352,42 @@ export declare class App {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2257
+  "size": 2304
 }
 
 
@@ -399,15 +439,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -442,10 +474,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -465,7 +498,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -595,21 +628,41 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2488
+  "size": 2306
 }
 
 
@@ -636,14 +689,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -677,7 +723,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -695,7 +747,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-4369626085-export interface ITest {\n    title: string;\n}","signature":"-2463740027-export interface ITest {\n    title: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -824,8 +876,42 @@ export interface ITest {
       "./lib2/data.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
+    ]
+  ],
   "version": "FakeTSVersion",
-  "size": 2257
+  "size": 2304
 }
 
 
@@ -852,14 +938,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -893,10 +972,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -916,7 +996,7 @@ export interface ITest {
 //// [/user/username/projects/myproject/lib2/public.d.ts] file written with same contents
 //// [/user/username/projects/myproject/app.d.ts] file written with same contents
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[[6,[{"start":174,"length":5,"code":2561,"category":1,"messageText":"Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./lib1/tools/toolsinterface.ts","./lib1/tools/public.ts","./lib1/public.ts","./lib2/data2.ts","./lib2/data.ts","./lib2/public.ts","./app.ts"],"fileIdsList":[[7],[3],[2],[4,5],[6]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3501597171-export interface ITest {\n    title2: string;\n}","signature":"-3883556937-export interface ITest {\n    title2: string;\n}\n"},{"version":"-10750058173-export * from \"./toolsinterface\";","signature":"-11154536019-export * from \"./toolsinterface\";\n"},{"version":"-5078933600-export * from \"./tools/public\";","signature":"-4396051542-export * from \"./tools/public\";\n"},{"version":"-11055285700-import { Data } from \"./data\";\nexport class Data2 {\n    public dat?: Data;\n}","signature":"-17387821545-import { Data } from \"./data\";\nexport declare class Data2 {\n    dat?: Data;\n}\n"},{"version":"-2056074887-import { ITest } from \"lib1/public\"; import { Data2 } from \"./data2\";\nexport class Data {\n    public dat?: Data2; public test() {\n        const result: ITest = {\n            title: \"title\"\n        }\n        return result;\n    }\n}","signature":"-14170088573-import { ITest } from \"lib1/public\";\nimport { Data2 } from \"./data2\";\nexport declare class Data {\n    dat?: Data2;\n    test(): ITest;\n}\n"},{"version":"-9530042629-export * from \"./data\";","signature":"-9548728731-export * from \"./data\";\n"},{"version":"-14937286564-import { Data } from \"lib2/public\";\nexport class App {\n    public constructor() {\n        new Data().test();\n    }\n}","signature":"-18990360330-export declare class App {\n    constructor();\n}\n"}],"root":[8],"options":{"declaration":true},"referencedMap":[[8,1],[4,2],[3,3],[6,4],[5,5],[7,5]],"semanticDiagnosticsPerFile":[1,2,3,4,5,6,7,8],"version":"FakeTSVersion"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1046,21 +1126,41 @@ export interface ITest {
     ]
   },
   "semanticDiagnosticsPerFile": [
+    [
+      "../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/toolsinterface.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/tools/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib1/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/data2.ts",
+      "not cached or not changed"
+    ],
     [
       "./lib2/data.ts",
-      [
-        {
-          "start": 174,
-          "length": 5,
-          "code": 2561,
-          "category": 1,
-          "messageText": "Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?"
-        }
-      ]
+      "not cached or not changed"
+    ],
+    [
+      "./lib2/public.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./app.ts",
+      "not cached or not changed"
     ]
   ],
   "version": "FakeTSVersion",
-  "size": 2488
+  "size": 2306
 }
 
 
@@ -1087,14 +1187,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
index fadb3473ec72c..0ebf856b59940 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
@@ -70,7 +70,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] Starting compilation in watch mode...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -264,15 +270,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -307,10 +305,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -352,14 +351,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -393,7 +385,13 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:6:5 - 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.
+
+6     "baseUrl": "."
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -433,14 +431,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
@@ -474,10 +465,11 @@ Output::
 >> Screen clear
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
-lib2/data.ts:5:13 - error TS2561: Object literal may only specify known properties, but 'title' does not exist in type 'ITest'. Did you mean to write 'title2'?
+tsconfig.json:6:5 - 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.
 
-5             title: "title"
-              ~~~~~
+6     "baseUrl": "."
+      ~~~~~~~~~
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
@@ -519,14 +511,7 @@ Program files::
 /user/username/projects/myproject/lib2/public.ts
 /user/username/projects/myproject/app.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/lib1/tools/toolsinterface.ts
-/user/username/projects/myproject/lib1/tools/public.ts
-/user/username/projects/myproject/lib1/public.ts
-/user/username/projects/myproject/lib2/data2.ts
-/user/username/projects/myproject/lib2/data.ts
-/user/username/projects/myproject/lib2/public.ts
-/user/username/projects/myproject/app.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/lib1/tools/toolsinterface.ts (computed .d.ts)
diff --git a/tests/baselines/reference/tscWatch/extends/configDir-template.js b/tests/baselines/reference/tscWatch/extends/configDir-template.js
index 4e0c2a0ae5a6c..4f860266b7df7 100644
--- a/tests/baselines/reference/tscWatch/extends/configDir-template.js
+++ b/tests/baselines/reference/tscWatch/extends/configDir-template.js
@@ -166,6 +166,12 @@ DirectoryWatcher:: Triggered with /home/src/projects/myproject/outDir :: WatchIn
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/myproject/outDir :: WatchInfo: /home/src/projects/myproject 0 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Failed Lookup Locations
 DirectoryWatcher:: Triggered with /home/src/projects/myproject/decls :: WatchInfo: /home/src/projects/myproject 0 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/myproject/decls :: WatchInfo: /home/src/projects/myproject 0 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Failed Lookup Locations
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -176,7 +182,7 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/myproject/src 1 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/myproject/src 1 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Wild card directory
@@ -294,12 +300,7 @@ Program files::
 /home/src/projects/myproject/root2/other/sometype2/index.d.ts
 /home/src/projects/myproject/src/secondary.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/home/src/projects/myproject/types/sometype.ts
-/home/src/projects/myproject/main.ts
-/home/src/projects/myproject/root2/other/sometype2/index.d.ts
-/home/src/projects/myproject/src/secondary.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -396,6 +397,12 @@ Resolving real path for '/home/src/projects/myproject/root2/other/sometype2/inde
 ======== Module name 'other/sometype2' was successfully resolved to '/home/src/projects/myproject/root2/other/sometype2/index.d.ts'. ========
 DirectoryWatcher:: Close:: WatchInfo: /home/src/projects/configs 1 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /home/src/projects/configs 1 {"excludeFiles":["/home/src/projects/myproject/main.ts"]} Failed Lookup Locations
+tsconfig.json:3:3 - 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.
+
+3   "compilerOptions": {
+    ~~~~~~~~~~~~~~~~~
+
 ../../tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 types/sometype.ts
@@ -406,7 +413,7 @@ root2/other/sometype2/index.d.ts
   Imported via "other/sometype2" from file 'src/secondary.ts'
 src/secondary.ts
   Matched by include pattern '${configDir}/src' in 'tsconfig.json'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -486,7 +493,7 @@ Program files::
 /home/src/projects/myproject/root2/other/sometype2/index.d.ts
 /home/src/projects/myproject/src/secondary.ts
 
-Semantic diagnostics in builder refreshed for::
+No cached semantic diagnostics in the builder::
 
 No shapes updated in the builder::
 
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 d98b14db30654..b2ea2accc3ed9 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
@@ -48,13 +48,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -89,13 +83,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 716
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 756
 }
 
 
@@ -173,13 +161,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,13 +196,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 734
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 694
-=======
-  "size": 701
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 741
 }
 
 
@@ -286,13 +262,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -336,13 +306,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 717
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 677
-=======
-  "size": 714
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 754
 }
 
 //// [/home/src/projects/outFile.js]
@@ -487,13 +451,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -526,13 +484,7 @@ Output::
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1055
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1015
-=======
-  "size": 712
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 752
 }
 
 
@@ -608,13 +560,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -681,13 +627,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1038
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 998
-=======
-  "size": 1035
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1075
 }
 
 //// [/home/src/projects/outFile.js]
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 96c3373ec55d1..1041dfa4bee63 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
@@ -47,13 +47,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -87,13 +81,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 733
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 693
-=======
-  "size": 697
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 737
 }
 
 
@@ -170,13 +158,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -210,13 +192,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -280,13 +256,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -329,13 +299,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -468,13 +432,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -570,13 +528,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -619,13 +571,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 713
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 673
-=======
-  "size": 710
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 750
 }
 
 //// [/home/src/projects/outFile.js]
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 8f85fd9874d32..033efbdc87fa7 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
@@ -47,13 +47,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -87,13 +81,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 689
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 729
 }
 
 
@@ -170,13 +158,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -210,13 +192,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -280,13 +256,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -329,13 +299,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
@@ -468,13 +432,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -506,13 +464,7 @@ Output::
     "./project/a.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 877
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 837
-=======
-  "size": 685
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 725
 }
 
 
@@ -576,13 +528,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -625,13 +571,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 857
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 817
-=======
-  "size": 702
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 742
 }
 
 //// [/home/src/projects/outFile.js] file written with same contents
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 c8c84fe12d168..6cc638ed56bfc 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
@@ -158,13 +158,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -198,13 +192,7 @@ Output::
     "../tslibs/ts/lib/lib.d.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 718
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 678
-=======
-  "size": 682
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 722
 }
 
 
@@ -268,13 +256,7 @@ Output::
 
 
 //// [/home/src/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../tslibs/ts/lib/lib.d.ts","./project/a.ts","./project/b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/home/src/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -317,13 +299,7 @@ Output::
     ]
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 698
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 658
-=======
-  "size": 695
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 735
 }
 
 //// [/home/src/projects/outFile.js]
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 cc6984043e910..b1700117f3384 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
@@ -212,13 +212,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -259,81 +253,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 944
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 904
-=======
-  "size": 938
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 978
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -556,13 +478,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -603,55 +519,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 935
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 895
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -733,13 +603,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -780,13 +644,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1274
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1234
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 
@@ -870,13 +728,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -917,101 +769,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 943
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 903
-=======
-  "size": 937
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 977
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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 {};
-}
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 8b0b6133752ef..0205c44d932fe 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-declaration.js
@@ -162,72 +162,6 @@ Output::
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const 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 {};
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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 {};
-}
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -391,46 +325,6 @@ Output::
 
 
 
-<<<<<<< HEAD
-//// [/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 });
-    const 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
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -587,92 +481,6 @@ Output::
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-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 {};
-}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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 {};
-}
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 e8075a6242cfd..da142ef28b17c 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError-with-incremental.js
@@ -209,13 +209,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -255,57 +249,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 925
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 885
-=======
-  "size": 919
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 959
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -525,13 +471,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -571,53 +511,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 910
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 950
 }
 
-<<<<<<< HEAD
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -698,13 +594,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -744,65 +634,9 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 926
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 966
 }
 
-<<<<<<< HEAD
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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");
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 Program root files: [
@@ -883,13 +717,7 @@ Output::
 
 
 //// [/user/username/projects/dev-build.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./noemitonerror/shared/types/db.ts","./noemitonerror/src/main.ts","./noemitonerror/src/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/dev-build.tsbuildinfo.readable.baseline.txt]
 {
@@ -929,13 +757,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 924
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 884
-=======
-  "size": 918
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 958
 }
 
 
diff --git a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
index 3a3bf4ada28db..8efe5a1e1b028 100644
--- a/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/noEmitOnError/outFile/noEmitOnError.js
@@ -160,48 +160,6 @@ Output::
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const a = {
-        lastName: 'sdsd'
-    };
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -361,44 +319,6 @@ Output::
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
-<<<<<<< HEAD
-
-
-//// [/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 });
-    const a = "hello";
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
@@ -477,56 +397,6 @@ Output::
 
 [HH:MM:SS AM] Found 1 error. Watching for file changes.
 
-<<<<<<< HEAD
-
-
-//// [/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;
-    const a = class {
-        constructor() {
-            this.p = 10;
-        }
-    };
-    exports.a = a;
-});
-define("src/other", ["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    console.log("hi");
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-
-
-//// [/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");
-});
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 
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 1b7ffed1f9b1c..b0692482f132f 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
@@ -39,6 +39,7 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 project/tsconfig.json:3:45 - 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.
 
 3                         "moduleResolution": "node"
                                               ~~~~~~
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 3cad9ef841629..402d1a65b00e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -35,6 +35,7 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 tsconfig.json:3: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.
 
 3     "moduleResolution": "node"
                           ~~~~~~
@@ -117,6 +118,7 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:3: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.
 
 3     "moduleResolution": "node",
                           ~~~~~~
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 554b61b629bd4..c791ee943a927 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -57,7 +57,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
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "client",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client 1 undefined Wild card directory
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client 1 undefined Wild card directory
@@ -125,10 +131,7 @@ Program files::
 /user/username/projects/myproject/client/folder1/module1.ts
 /user/username/projects/myproject/client/linktofolder2/module2.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/myproject/client/folder1/module1.ts
-/user/username/projects/myproject/client/linktofolder2/module2.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -170,7 +173,13 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client/linkto
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/folder2/module3.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "client",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -230,8 +239,7 @@ Program files::
 /user/username/projects/myproject/client/linktofolder2/module2.ts
 /user/username/projects/myproject/client/linktofolder2/module3.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/myproject/client/linktofolder2/module3.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/myproject/client/linktofolder2/module3.ts (computed .d.ts)
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 053d4adeb789b..f74966b8ae45f 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
@@ -97,13 +97,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -168,13 +162,7 @@ declare class class2 {
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 912
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 872
-=======
-  "size": 909
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 949
 }
 
 
@@ -285,122 +273,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 
 
-<<<<<<< HEAD
-//// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 926
-}
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-}
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -533,13 +405,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -618,13 +484,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1014
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 974
-=======
-  "size": 1013
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1053
 }
 
 
@@ -761,13 +621,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -832,13 +686,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 947
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 907
-=======
-  "size": 909
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 949
 }
 
 
@@ -979,13 +827,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1064,13 +906,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1014
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 974
-=======
-  "size": 1013
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1053
 }
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 56dcc02feebba..0eedc48f214dc 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -145,7 +145,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2591036212-import {A} from '@ref/a';\nexport const b = new A();","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2591036212-import {A} from '@ref/a';\nexport const b = new A();","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -196,9 +196,23 @@ export declare const b: A;
       "../a/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../a/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 943
+  "size": 980
 }
 
 //// [/user/username/projects/transitiveReferences/c/index.js]
@@ -211,15 +225,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/c/tsconfig.tsbuildinfo]
-{"root":["./index.ts"],"version":"FakeTSVersion"}
+{"root":["./index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 49
+  "size": 63
 }
 
 
@@ -256,6 +271,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -268,7 +289,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -337,12 +358,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -397,7 +413,7 @@ export declare function gfoo(): void;
 
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"1841609480-import {A} from '@ref/a';\nexport const b = new A();export function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"1841609480-import {A} from '@ref/a';\nexport const b = new A();export function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -448,12 +464,35 @@ export declare function gfoo(): void;
       "../a/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../a/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1006
+  "size": 1043
 }
 
 
+Output::
+b/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./",
+      ~~~~~~~~~
+
+
+
 Timeout callback:: count: 1
 1: timerToUpdateProgram *new*
 
@@ -466,6 +505,12 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -478,7 +523,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -510,9 +555,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.d.ts (used version)
@@ -608,6 +651,12 @@ File '/user/username/projects/transitiveReferences/nrefs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -620,7 +669,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -698,9 +747,7 @@ Program files::
 /user/username/projects/transitiveReferences/nrefs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -789,6 +836,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -801,7 +854,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -879,9 +932,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/refs/a.d.ts (used version)
@@ -949,6 +1000,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/nrefs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 nrefs/a.d.ts
@@ -960,7 +1017,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1035,10 +1092,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -1107,6 +1161,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 refs/a.d.ts
@@ -1117,7 +1177,7 @@ b/index.d.ts
   File is output of project reference source 'b/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1191,8 +1251,7 @@ Program files::
 /user/username/projects/transitiveReferences/b/index.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.d.ts (used version)
@@ -1248,6 +1307,12 @@ File '/user/username/projects/transitiveReferences/refs/a.ts' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.tsx' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it as a name resolution result.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 c/tsconfig.json:11:5 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 11     {
@@ -1266,7 +1331,7 @@ b/index.ts
   Imported via '../b' from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1343,9 +1408,7 @@ Program files::
 /user/username/projects/transitiveReferences/b/index.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.ts (computed .d.ts)
@@ -1411,6 +1474,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -1423,7 +1492,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1500,10 +1569,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.d.ts (used version)
@@ -1563,6 +1629,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 14     }
    ~~~~~
 
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.ts
@@ -1574,7 +1646,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1651,10 +1723,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.ts (computed .d.ts)
@@ -1711,6 +1780,12 @@ Output::
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -1723,7 +1798,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Matched by default include pattern '**/*'
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1799,10 +1874,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 477ba08402f20..19aae2613d364 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -154,7 +154,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2591036212-import {A} from '@ref/a';\nexport const b = new A();","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-2591036212-import {A} from '@ref/a';\nexport const b = new A();","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -205,9 +205,23 @@ export declare const b: A;
       "../a/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../a/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 943
+  "size": 980
 }
 
 //// [/user/username/projects/transitiveReferences/c/index.js]
@@ -220,15 +234,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/c/tsconfig.tsbuildinfo]
-{"root":["./index.ts"],"version":"FakeTSVersion"}
+{"root":["./index.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/c/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./index.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 49
+  "size": 63
 }
 
 
@@ -265,6 +280,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -277,7 +298,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -344,12 +365,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -404,7 +420,7 @@ export declare function gfoo(): void;
 
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"1841609480-import {A} from '@ref/a';\nexport const b = new A();export function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../a/index.d.ts","./index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"1841609480-import {A} from '@ref/a';\nexport const b = new A();export function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/b/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -455,12 +471,35 @@ export declare function gfoo(): void;
       "../a/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../a/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1006
+  "size": 1043
 }
 
 
+Output::
+b/tsconfig.json:4:5 - 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.
+
+4     "baseUrl": "./",
+      ~~~~~~~~~
+
+
+
 Timeout callback:: count: 1
 1: timerToUpdateProgram *new*
 
@@ -473,6 +512,12 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -485,7 +530,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -517,9 +562,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.d.ts (used version)
@@ -618,6 +661,12 @@ File '/user/username/projects/transitiveReferences/nrefs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -630,7 +679,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -706,9 +755,7 @@ Program files::
 /user/username/projects/transitiveReferences/nrefs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -800,6 +847,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -812,7 +865,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -888,9 +941,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/refs/a.d.ts (used version)
@@ -961,6 +1012,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/nrefs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 nrefs/a.d.ts
@@ -972,7 +1029,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1047,10 +1104,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -1122,6 +1176,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 refs/a.d.ts
@@ -1132,7 +1192,7 @@ b/index.d.ts
   File is output of project reference source 'b/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1202,8 +1262,7 @@ Program files::
 /user/username/projects/transitiveReferences/b/index.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.d.ts (used version)
@@ -1259,6 +1318,12 @@ File '/user/username/projects/transitiveReferences/refs/a.ts' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.tsx' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it as a name resolution result.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 c/tsconfig.json:14:5 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 14     {
@@ -1277,7 +1342,7 @@ b/index.ts
   Imported via '../b' from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1348,9 +1413,7 @@ Program files::
 /user/username/projects/transitiveReferences/b/index.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b/index.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b/index.ts (computed .d.ts)
@@ -1419,6 +1482,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/b/tsconfig.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'. ========
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -1431,7 +1500,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1506,10 +1575,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.d.ts (used version)
@@ -1569,6 +1635,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 17     }
    ~~~~~
 
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.ts
@@ -1580,7 +1652,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1655,10 +1727,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.ts (computed .d.ts)
@@ -1718,6 +1787,12 @@ Output::
 Reusing resolution of module '../b' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b/index.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b/index.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a/index.ts'.
+c/tsconfig.json:3:5 - 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.
+
+3     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a/index.d.ts
@@ -1730,7 +1805,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c/index.ts'
 c/index.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1804,10 +1879,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c/index.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a/index.d.ts
-/user/username/projects/transitiveReferences/b/index.d.ts
-/user/username/projects/transitiveReferences/c/index.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a/index.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-with-nodenext.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-with-nodenext.js
index 88e33b942d804..8b79c0a0abcc6 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-with-nodenext.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-with-nodenext.js
@@ -169,7 +169,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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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,"impliedFormat":1},{"version":"-8728835846-export declare class A {\n}\n","impliedFormat":1},{"version":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n","impliedFormat":1}],"root":[3],"options":{"composite":true,"module":199,"target":1},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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,"impliedFormat":1},{"version":"-8728835846-export declare class A {\n}\n","impliedFormat":1},{"version":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n","impliedFormat":1}],"root":[3],"options":{"composite":true,"module":199,"target":1},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -231,9 +231,23 @@ 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": 1017
+  "size": 1054
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
@@ -246,15 +260,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
@@ -312,6 +327,12 @@ File '/home/src/tslibs/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 according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -328,7 +349,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -401,12 +422,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -462,7 +478,7 @@ export declare function gfoo(): void;
 
 
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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,"impliedFormat":1},{"version":"-8728835846-export declare class A {\n}\n","impliedFormat":1},{"version":"-3352421102-import {A} from '@ref/a';\nexport const b = new A();\nexport function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n","impliedFormat":1}],"root":[3],"options":{"composite":true,"module":199,"target":1},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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,"impliedFormat":1},{"version":"-8728835846-export declare class A {\n}\n","impliedFormat":1},{"version":"-3352421102-import {A} from '@ref/a';\nexport const b = new A();\nexport function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n","impliedFormat":1}],"root":[3],"options":{"composite":true,"module":199,"target":1},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -524,12 +540,35 @@ export declare function gfoo(): void;
       "./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": 1081
+  "size": 1118
 }
 
 
+Output::
+tsconfig.b.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
+
+
 Timeout callback:: count: 1
 1: timerToUpdateProgram *new*
 
@@ -569,6 +608,12 @@ File '/user/username/package.json' does not exist according to earlier cached lo
 File '/user/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -585,7 +630,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -619,9 +664,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.d.ts (used version)
@@ -741,6 +784,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -757,7 +806,7 @@ nrefs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -843,9 +892,7 @@ Program files::
 /user/username/projects/transitiveReferences/nrefs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -960,6 +1007,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -976,7 +1029,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1062,9 +1115,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/refs/a.d.ts (used version)
@@ -1165,6 +1216,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 nrefs/a.d.ts
@@ -1180,7 +1237,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1261,10 +1318,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -1360,6 +1414,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 refs/a.d.ts
@@ -1373,7 +1433,7 @@ b.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1455,8 +1515,7 @@ Program files::
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.d.ts (used version)
@@ -1532,6 +1591,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 tsconfig.c.json:16:5 - error TS6053: File '/user/username/projects/transitiveReferences/tsconfig.b.json' not found.
 
 16     {
@@ -1553,7 +1618,7 @@ b.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1629,9 +1694,7 @@ Program files::
 /user/username/projects/transitiveReferences/b.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.ts (computed .d.ts)
@@ -1727,6 +1790,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -1743,7 +1812,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1821,10 +1890,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.d.ts (used version)
@@ -1909,6 +1975,12 @@ File '/package.json' does not exist according to earlier cached lookups.
 19     }
    ~~~~~
 
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.ts
@@ -1924,7 +1996,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -2002,10 +2074,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.ts (computed .d.ts)
@@ -2092,6 +2161,12 @@ File '/home/src/tslibs/package.json' does not exist according to earlier cached
 File '/home/src/package.json' does not exist according to earlier cached lookups.
 File '/home/package.json' does not exist according to earlier cached lookups.
 File '/package.json' does not exist according to earlier cached lookups.
+tsconfig.c.json:8:5 - 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.
+
+8     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -2108,7 +2183,7 @@ refs/a.d.ts
 c.ts
   Part of 'files' list in tsconfig.json
   File is CommonJS module because 'package.json' was not found
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -2185,10 +2260,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
index aee3cc2158844..53314db564d15 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
@@ -157,7 +157,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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/a';\nexport declare const b: A;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3899816362-import {A} from '@ref/a';\nexport const b = new A();\n","signature":"-9732944696-import { A } from '@ref/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"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -208,9 +208,23 @@ 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": 927
+  "size": 964
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
@@ -223,15 +237,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
@@ -262,6 +277,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -274,7 +295,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -333,12 +354,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
@@ -394,7 +410,7 @@ export declare function gfoo(): void;
 
 
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3352421102-import {A} from '@ref/a';\nexport const b = new A();\nexport function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-3352421102-import {A} from '@ref/a';\nexport const b = new A();\nexport function gfoo() { }","signature":"4376023469-import { A } from '@ref/a';\nexport declare const b: A;\nexport declare function gfoo(): void;\n"}],"root":[3],"options":{"composite":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./b.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -445,12 +461,35 @@ export declare function gfoo(): void;
       "./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": 991
+  "size": 1028
 }
 
 
+Output::
+tsconfig.b.json:4:5 - 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.
+
+4     "baseUrl": "./",
+      ~~~~~~~~~
+
+
+
 Timeout callback:: count: 1
 1: timerToUpdateProgram *new*
 
@@ -463,6 +502,12 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'.
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -475,7 +520,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -507,9 +552,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.d.ts (used version)
@@ -600,6 +643,12 @@ File '/user/username/projects/transitiveReferences/nrefs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -612,7 +661,7 @@ nrefs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -680,9 +729,7 @@ Program files::
 /user/username/projects/transitiveReferences/nrefs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -768,6 +815,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -780,7 +833,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -848,9 +901,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/refs/a.d.ts (used version)
@@ -921,6 +972,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/nrefs/a.d.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 nrefs/a.d.ts
@@ -932,7 +989,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -997,10 +1054,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/nrefs/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/nrefs/a.d.ts (used version)
@@ -1072,6 +1126,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 refs/a.d.ts
@@ -1082,7 +1142,7 @@ b.d.ts
   File is output of project reference source 'b.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1146,8 +1206,7 @@ Program files::
 /user/username/projects/transitiveReferences/b.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.d.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.d.ts (used version)
@@ -1201,6 +1260,12 @@ File '/user/username/projects/transitiveReferences/refs/a.ts' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.tsx' does not exist.
 File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it as a name resolution result.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 tsconfig.c.json:14:5 - error TS6053: File '/user/username/projects/transitiveReferences/tsconfig.b.json' not found.
 
 14     {
@@ -1219,7 +1284,7 @@ b.ts
   Imported via './b' from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1281,9 +1346,7 @@ Program files::
 /user/username/projects/transitiveReferences/b.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/b.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/b.ts (computed .d.ts)
@@ -1350,6 +1413,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Module resolution kind is not specified, using 'Bundler'.
 ======== Module name '@ref/a' was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -1362,7 +1431,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1426,10 +1495,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.d.ts (used version)
@@ -1487,6 +1553,12 @@ Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveRe
 17     }
    ~~~~~
 
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.ts
@@ -1498,7 +1570,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
@@ -1562,10 +1634,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.ts (computed .d.ts)
@@ -1623,6 +1692,12 @@ Output::
 Reusing resolution of module './b' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/b.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/c.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/refs/a.d.ts'.
 Reusing resolution of module '@ref/a' from '/user/username/projects/transitiveReferences/b.ts' of old program, it was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'.
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -1635,7 +1710,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -1698,10 +1773,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /user/username/projects/transitivereferences/a.d.ts (used version)
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 77a37b62095cb..c366dbd711807 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
@@ -150,13 +150,7 @@ export declare const b: A;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.d.ts","./b.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.b.tsbuildinfo.readable.baseline.txt]
 {
@@ -223,13 +217,7 @@ export declare const b: A;
   ],
   "latestChangedDtsFile": "./b.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 917
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 877
-=======
-  "size": 914
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 954
 }
 
 //// [/user/username/projects/transitiveReferences/c.js]
@@ -242,15 +230,16 @@ a_1.X;
 
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo]
-{"root":["./c.ts"],"version":"FakeTSVersion"}
+{"root":["./c.ts"],"errors":true,"version":"FakeTSVersion"}
 
 //// [/user/username/projects/transitiveReferences/tsconfig.c.tsbuildinfo.readable.baseline.txt]
 {
   "root": [
     "./c.ts"
   ],
+  "errors": true,
   "version": "FakeTSVersion",
-  "size": 45
+  "size": 59
 }
 
 
@@ -281,6 +270,12 @@ File '/user/username/projects/transitiveReferences/refs/a.d.ts' exists - use it
 Using compiler options of project reference redirect '/user/username/projects/transitiveReferences/tsconfig.b.json'.
 Explicitly specified module resolution kind: 'Classic'.
 ======== Module name 'a' was successfully resolved to '/user/username/projects/transitiveReferences/a.ts'. ========
+tsconfig.c.json:6:5 - 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.
+
+6     "baseUrl": "./",
+      ~~~~~~~~~
+
 ../../../../home/src/tslibs/TS/Lib/lib.d.ts
   Default library for target 'es5'
 a.d.ts
@@ -293,7 +288,7 @@ refs/a.d.ts
   Imported via "@ref/a" from file 'c.ts'
 c.ts
   Part of 'files' list in tsconfig.json
-[HH:MM:SS AM] Found 0 errors. Watching for file changes.
+[HH:MM:SS AM] Found 1 error. Watching for file changes.
 
 
 
@@ -352,12 +347,7 @@ Program files::
 /user/username/projects/transitiveReferences/refs/a.d.ts
 /user/username/projects/transitiveReferences/c.ts
 
-Semantic diagnostics in builder refreshed for::
-/home/src/tslibs/TS/Lib/lib.d.ts
-/user/username/projects/transitiveReferences/a.d.ts
-/user/username/projects/transitiveReferences/b.d.ts
-/user/username/projects/transitiveReferences/refs/a.d.ts
-/user/username/projects/transitiveReferences/c.ts
+No cached semantic diagnostics in the builder::
 
 Shape signatures in builder refreshed for::
 /home/src/tslibs/ts/lib/lib.d.ts (used version)
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
index 68bc3b96ae3c6..ca9e7817d74cc 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
@@ -54,11 +54,18 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 tsconfig.json:4: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.
 
 4     "moduleResolution": "node",
                           ~~~~~~
 
-[HH:MM:SS AM] Found 1 error. Watching for file changes.
+tsconfig.json:5:5 - 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.
+
+5     "baseUrl": ".",
+      ~~~~~~~~~
+
+[HH:MM:SS AM] Found 2 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index be9487bc4dec0..63edf3bd2ee2d 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -44,6 +44,7 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 src/tsconfig.json:6: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.
 
 6     "moduleResolution": "node",
                           ~~~~~~
@@ -158,6 +159,7 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 src/tsconfig.json:6: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.
 
 6     "moduleResolution": "node",
                           ~~~~~~
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 f62ea01fa6ca0..e05e53e18c5c4 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
@@ -219,13 +219,7 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -288,13 +282,7 @@ CreatingProgramWith::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 957
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 917
-=======
-  "size": 843
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 883
 }
 
 
@@ -338,160 +326,6 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
-<<<<<<< HEAD
-//// [/user/username/projects/myproject/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 916
-}
-
-//// [/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;
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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;
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 62090bf4bdcae..490d4f99c7bb7 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
@@ -46,13 +46,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -87,13 +81,7 @@ Output::
     "./myproject/other.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 751
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 711
-=======
-  "size": 718
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 758
 }
 
 
@@ -155,13 +143,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -207,13 +189,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 913
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 953
 }
 
 //// [/user/username/projects/outFile.js]
@@ -346,13 +322,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -387,13 +357,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 949
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 909
-=======
-  "size": 912
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 952
 }
 
 
@@ -455,13 +419,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -507,13 +465,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
 //// [/user/username/projects/outFile.js]
@@ -639,13 +591,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -691,13 +637,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 948
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 908
-=======
-  "size": 945
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 985
 }
 
 //// [/user/username/projects/outFile.js]
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 1c16d89b7f784..5b7d7b0941296 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
@@ -46,13 +46,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -87,13 +81,7 @@ Output::
     "./myproject/other.ts"
   ],
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 751
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 711
-=======
-  "size": 718
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 758
 }
 
 
@@ -162,13 +150,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -214,13 +196,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 916
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 876
-=======
-  "size": 913
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 953
 }
 
 //// [/user/username/projects/outFile.js]
@@ -360,13 +336,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -401,13 +371,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 949
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 909
-=======
-  "size": 912
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 952
 }
 
 
@@ -476,13 +440,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -528,13 +486,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 932
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 892
-=======
-  "size": 929
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 969
 }
 
 //// [/user/username/projects/outFile.js]
@@ -667,13 +619,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -708,13 +654,7 @@ Output::
   "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",
-<<<<<<< HEAD
-  "size": 948
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 908
-=======
-  "size": 928
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 968
 }
 
 //// [/user/username/projects/outFile.js]
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 3c940677831f8..fa29ebad4c52f 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
@@ -340,13 +340,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -382,13 +376,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 937
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 897
-=======
-  "size": 749
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 789
 }
 
 
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 bfdf083c978c6..f66d1993de2ff 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
@@ -354,13 +354,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -396,13 +390,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 937
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 897
-=======
-  "size": 749
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 789
 }
 
 
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 cb16c8a63382b..8062df898157c 100644
--- a/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/outFile/semantic-builder-emitOnlyDts.js
@@ -187,13 +187,7 @@ Output::
 
 
 //// [/user/username/projects/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../home/src/tslibs/ts/lib/lib.d.ts","./myproject/main.ts","./myproject/other.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -229,13 +223,7 @@ Output::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 953
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 913
-=======
-  "size": 749
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 789
 }
 
 
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 31e234bcd79e3..e56a5a2e2ec7a 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
@@ -195,13 +195,7 @@ CreatingProgramWith::
 
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/outFile.tsbuildinfo.readable.baseline.txt]
 {
@@ -237,13 +231,7 @@ CreatingProgramWith::
   ],
   "errors": true,
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 923
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 883
-=======
-  "size": 725
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 765
 }
 
 
@@ -289,114 +277,6 @@ exitCode:: ExitStatus.undefined
 Change:: Emit all files
 
 Input::
-<<<<<<< HEAD
-//// [/user/username/projects/myproject/outFile.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./a.ts","./b.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 907
-}
-
-//// [/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;
-});
-
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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;
-});
-
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 
 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 1f4770f59c003..526e96ada690d 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
@@ -97,13 +97,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -168,13 +162,7 @@ declare class class2 {
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 912
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 872
-=======
-  "size": 909
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 949
 }
 
 
@@ -283,122 +271,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 
 
-<<<<<<< HEAD
-//// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": "3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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": 926
-}
-
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-//// [/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
-}
-
-=======
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 
 PolledWatches::
 /user/username/projects/myproject/node_modules/@types:
@@ -529,13 +401,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -614,13 +480,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1014
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 974
-=======
-  "size": 1013
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1053
 }
 
 
@@ -755,13 +615,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -826,13 +680,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 947
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 907
-=======
-  "size": 909
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 949
 }
 
 
@@ -971,13 +819,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.d.ts","../project1/class3.d.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -1056,13 +898,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1014
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 974
-=======
-  "size": 1013
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1053
 }
 
 
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 72d3ac1fab690..c0b157d2879b7 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
@@ -97,13 +97,7 @@ declare class class2 {
 
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -168,13 +162,7 @@ declare class class2 {
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 900
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 860
-=======
-  "size": 897
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 937
 }
 
 
@@ -272,13 +260,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 //// [/user/username/projects/myproject/projects/project2/class2.js] file written with same contents
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","../project1/class3.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../../home/src/tslibs/ts/lib/lib.d.ts","../project1/class1.ts","../project1/class3.ts","./class2.ts"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/projects/project2/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -359,13 +341,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
   ],
   "latestChangedDtsFile": "./class2.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1098
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1058
-=======
-  "size": 1097
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1137
 }
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index ccf5fdffa14aa..292359ff6d097 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -31,6 +31,7 @@ Output::
 [HH:MM:SS AM] Starting compilation in watch mode...
 
 tsconfig.json:1:44 - 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.
 
 1 { "compilerOptions": { "moduleResolution": "node10" } }
                                              ~~~~~~~~
@@ -182,6 +183,7 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:1:44 - 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.
 
 1 { "compilerOptions": { "moduleResolution": "node10" } }
                                              ~~~~~~~~
@@ -285,6 +287,7 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:1:44 - 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.
 
 1 { "compilerOptions": { "moduleResolution": "node10" } }
                                              ~~~~~~~~
@@ -448,6 +451,7 @@ Output::
 [HH:MM:SS AM] File change detected. Starting incremental compilation...
 
 tsconfig.json:1:44 - 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.
 
 1 { "compilerOptions": { "moduleResolution": "node10" } }
                                              ~~~~~~~~
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
index 2ae2b214acd4e..013a3f1127546 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
@@ -281,10 +281,24 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 7,
               "offset": 31
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 22,
+              "offset": 5
+            },
+            "end": {
+              "line": 22,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
index 981c65f403c3a..ce657b9d58976 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
@@ -281,10 +281,24 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 7,
               "offset": 31
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 22,
+              "offset": 5
+            },
+            "end": {
+              "line": 22,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/Users/someuser/work/applications/frontend/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
index d550221c81458..203ce9d04341b 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
@@ -196,7 +196,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/a/b/controllers/vessels/client.ts",
         "configFile": "/user/username/projects/project/a/b/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/a/b/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/project/a/b/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
index 886d5131a3d15..dfa525c726d77 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-creating-new-file-in-symlinked-folder.js
@@ -170,7 +170,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/client/linktofolder2/module2.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/ambient-module-specifier-resolutions-do-not-count-against-the-resolution-limit.js b/tests/baselines/reference/tsserver/completionsIncomplete/ambient-module-specifier-resolutions-do-not-count-against-the-resolution-limit.js
index 41d7abe9f71d0..c5c7f32ecf8ee 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/ambient-module-specifier-resolutions-do-not-count-against-the-resolution-limit.js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/ambient-module-specifier-resolutions-do-not-count-against-the-resolution-limit.js
@@ -2176,7 +2176,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(1).js b/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(1).js
index a2260a9a11e23..507358bcb8a5a 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(1).js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(1).js
@@ -3026,7 +3026,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(2).js b/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(2).js
index cab5a104651c0..2a36fd26f4dff 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(2).js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/resolves-more-when-available-from-module-specifier-cache-(2).js
@@ -1376,7 +1376,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/works-for-transient-symbols-between-requests.js b/tests/baselines/reference/tsserver/completionsIncomplete/works-for-transient-symbols-between-requests.js
index 87ec69cec0e4c..6a2f028125880 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/works-for-transient-symbols-between-requests.js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/works-for-transient-symbols-between-requests.js
@@ -987,7 +987,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/works-with-PackageJsonAutoImportProvider.js b/tests/baselines/reference/tsserver/completionsIncomplete/works-with-PackageJsonAutoImportProvider.js
index 13158e5492d43..2090911778241 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/works-with-PackageJsonAutoImportProvider.js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/works-with-PackageJsonAutoImportProvider.js
@@ -1352,7 +1352,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/completionsIncomplete/works.js b/tests/baselines/reference/tsserver/completionsIncomplete/works.js
index 0ec4f90cee49d..606e435938e43 100644
--- a/tests/baselines/reference/tsserver/completionsIncomplete/works.js
+++ b/tests/baselines/reference/tsserver/completionsIncomplete/works.js
@@ -2176,7 +2176,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 1,
               "offset": 74
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/project/project/tsconfig.json"
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 df25e66bbfd7c..c4fd6188d8016 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
@@ -177,7 +177,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 3,
               "offset": 33
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/user/username/projects/project/a/b/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/extends/configDir-template.js b/tests/baselines/reference/tsserver/extends/configDir-template.js
index 87c1c856c8d5e..bd04440d0a865 100644
--- a/tests/baselines/reference/tsserver/extends/configDir-template.js
+++ b/tests/baselines/reference/tsserver/extends/configDir-template.js
@@ -335,7 +335,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/myproject/src/secondary.ts",
         "configFile": "/home/src/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 3
+            },
+            "end": {
+              "line": 3,
+              "offset": 20
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/home/src/projects/myproject/tsconfig.json' (Configured)
@@ -571,7 +586,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/myproject/tsconfig.json",
         "configFile": "/home/src/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 3
+            },
+            "end": {
+              "line": 3,
+              "offset": 20
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js
index 07cb133c3ccc3..e0e909a3f646c 100644
--- a/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js
+++ b/tests/baselines/reference/tsserver/forceConsistentCasingInFileNames/works-when-extends-is-specified-with-a-case-insensitive-file-system.js
@@ -183,7 +183,13 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/Users/username/dev/project/index.ts",
         "configFile": "/Users/username/dev/project/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/Users/username/dev/project/tsconfig.json' (Configured)
@@ -255,7 +261,13 @@ Info seq  [hh:mm:ss:mss] request:
     }
 Info seq  [hh:mm:ss:mss] response:
     {
-      "response": [],
+      "response": [
+        {
+          "message": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+          "category": "error",
+          "code": 5101
+        }
+      ],
       "responseRequired": true
     }
 After request
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
index 84f36a547313e..e3d777f697680 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_baseUrl_toDist.js
@@ -309,10 +309,24 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 4,
               "offset": 31
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/workspaces/project/web/tsconfig.json"
+          },
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/web/tsconfig.json"
           }
         ]
       }
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
index f015ef13515bb..2c1091c746f4a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_sharedOutDir.js
@@ -297,6 +297,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/index.ts",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 3
+            },
+            "end": {
+              "line": 3,
+              "offset": 20
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 4,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
index c3a4f1761d644..3fd920dc36485 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_stripSrc.js
@@ -198,6 +198,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 12,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
index 4e4de259059a2..3f1131035a59f 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist.js
@@ -198,6 +198,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 12,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
index f9fcbbb0087d6..5ab991285c489 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toDist2.js
@@ -316,7 +316,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 4,
               "offset": 31
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/workspaces/project/web/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
index 9980fa1ccd535..a1cf39bd77c69 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_paths_toSrc.js
@@ -198,6 +198,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 12,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
index b2f68bd4c0f4c..8c8b013109ca1 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_stripSrc.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 11,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
index f789a357bf3ff..2bfcc41343cd4 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toDist.js
@@ -168,6 +168,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 11,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
index 1136134965c19..5adff2efb626a 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportCrossProject_symlinks_toSrc.js
@@ -159,6 +159,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/workspaces/project/packages/app/package.json",
         "configFile": "/home/src/workspaces/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 8,
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
index 2496829f1586a..86fc683314cbe 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider3.js
@@ -1040,14 +1040,19 @@ watchedFiles::
   {"pollingInterval":2000}
 
 watchedDirectoriesRecursive::
+/home/src/workspaces/node_modules:
+  {}
 /home/src/workspaces/node_modules/@types:
   {}
   {}
-/home/src/workspaces/project/node_modules: *new*
+/home/src/workspaces/project/node_modules:
   {}
+  {} *new*
 /home/src/workspaces/project/node_modules/@types:
   {}
   {}
+/home/src/workspaces/project/node_modules/common-dependency/node_modules:
+  {}
 /home/src/workspaces/project/node_modules/common-dependency/node_modules/@types:
   {}
 /home/src/workspaces/project/node_modules/node_modules/@types:
diff --git a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
index 3a0aee1fdb801..4b9b47d047992 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/autoImportProvider_exportMap2.js
@@ -146,7 +146,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 4,
               "offset": 33
             },
-            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.",
+            "text": "Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
             "code": 5107,
             "category": "error",
             "fileName": "/home/src/workspaces/project/tsconfig.json"
diff --git a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
index 31b2cc3971cab..721274737277e 100644
--- a/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
+++ b/tests/baselines/reference/tsserver/fourslashServer/importSuggestionsCache_coreNodeModules.js
@@ -3598,22 +3598,6 @@ Info seq  [hh:mm:ss:mss] request:
       "command": "completionInfo"
     }
 Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /home/src/workspaces/project/tsconfig.json
-<<<<<<< HEAD
-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/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
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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] 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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 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)
@@ -4224,48 +4208,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/workspaces/project/jsconfig.json:
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/@types/node/index.d.ts:
-  {"pollingInterval":500}
-/home/src/workspaces/project/node_modules/@types/node/package.json:
-  {"pollingInterval":2000}
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/@types/package.json:
-  {"pollingInterval":2000}
-  {"pollingInterval":2000}
-/home/src/workspaces/project/node_modules/package.json:
-  {"pollingInterval":2000}
-  {"pollingInterval":2000}
-/home/src/workspaces/project/package.json:
-  {"pollingInterval":2000}
-  {"pollingInterval":2000}
-  {"pollingInterval":250}
-/home/src/workspaces/project/tsconfig.json:
-  {"pollingInterval":2000}
-
-watchedDirectoriesRecursive::
-/home/src/workspaces/node_modules:
-  {}
-  {}
-/home/src/workspaces/node_modules/@types:
-  {}
-/home/src/workspaces/project:
-  {}
-/home/src/workspaces/project/node_modules:
-  {}
-  {}
-/home/src/workspaces/project/node_modules/@types:
-  {}
-  {}
-
 Projects::
 /dev/null/inferredProject1* (Inferred)
     projectStateVersion: 1
diff --git a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js
index b2b7741ab2490..7b3face55846a 100644
--- a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js
+++ b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project-built.js
@@ -143,7 +143,7 @@ export * from "./subfolder";
 //# sourceMappingURL=index.d.ts.map
 
 //// [/home/src/projects/project/packages/package-a/build/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.es2021.d.ts","../src/subfolder/index.ts","../src/index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11228512861-export const FOO = \"bar\";","signature":"-8746013027-export declare const FOO = \"bar\";\n"},{"version":"-16576232793-export * from \"./subfolder\";","signature":"-14439737455-export * from \"./subfolder\";\n"}],"root":[2,3],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declarationMap":true,"esModuleInterop":true,"module":99,"outDir":"./","rootDir":"../src","target":8,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.es2021.d.ts","../src/subfolder/index.ts","../src/index.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-11228512861-export const FOO = \"bar\";","signature":"-8746013027-export declare const FOO = \"bar\";\n"},{"version":"-16576232793-export * from \"./subfolder\";","signature":"-14439737455-export * from \"./subfolder\";\n"}],"root":[2,3],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declarationMap":true,"esModuleInterop":true,"module":99,"outDir":"./","rootDir":"../src","target":8,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/projects/project/packages/package-a/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -210,9 +210,23 @@ export * from "./subfolder";
       "../src/subfolder/index.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.es2021.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/subfolder/index.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1168
+  "size": 1205
 }
 
 //// [/home/src/projects/project/packages/package-b/build/index.js]
@@ -228,7 +242,7 @@ export {};
 //# sourceMappingURL=index.d.ts.map
 
 //// [/home/src/projects/project/packages/package-b/build/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../tslibs/ts/lib/lib.es2021.d.ts","../../package-a/build/subfolder/index.d.ts","../../package-a/build/index.d.ts","../src/index.ts"],"fileIdsList":[[2],[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-8746013027-export declare const FOO = \"bar\";\n","-14439737455-export * from \"./subfolder\";\n",{"version":"-5331409584-import { FOO } from \"package-a\";\nconsole.log(FOO);\n","signature":"-3531856636-export {};\n"}],"root":[4],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declarationMap":true,"esModuleInterop":true,"module":99,"outDir":"./","rootDir":"../src","target":8,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"referencedMap":[[3,1],[4,2]],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../tslibs/ts/lib/lib.es2021.d.ts","../../package-a/build/subfolder/index.d.ts","../../package-a/build/index.d.ts","../src/index.ts"],"fileIdsList":[[2],[3]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-8746013027-export declare const FOO = \"bar\";\n","-14439737455-export * from \"./subfolder\";\n",{"version":"-5331409584-import { FOO } from \"package-a\";\nconsole.log(FOO);\n","signature":"-3531856636-export {};\n"}],"root":[4],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declarationMap":true,"esModuleInterop":true,"module":99,"outDir":"./","rootDir":"../src","target":8,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"referencedMap":[[3,1],[4,2]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./index.d.ts","version":"FakeTSVersion"}
 
 //// [/home/src/projects/project/packages/package-b/build/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -298,9 +312,27 @@ export {};
       "../../package-a/build/index.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../tslibs/ts/lib/lib.es2021.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../package-a/build/subfolder/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../../package-a/build/index.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/index.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./index.d.ts",
   "version": "FakeTSVersion",
-  "size": 1212
+  "size": 1251
 }
 
 
@@ -578,7 +610,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/project/packages/package-b/src/index.ts",
         "configFile": "/home/src/projects/project/packages/package-b/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/packages/package-b/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/projects/project/packages/package-b/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js
index d1e4e16b143db..3cfae7b6cee1d 100644
--- a/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js
+++ b/tests/baselines/reference/tsserver/moduleResolution/using-referenced-project.js
@@ -393,7 +393,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/projects/project/packages/package-b/src/index.ts",
         "configFile": "/home/src/projects/project/packages/package-b/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/packages/package-b/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/projects/project/packages/package-b/tsconfig.json ProjectRootPath: undefined:: Result: undefined
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 394b9fff07413..09806cc93f34b 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
@@ -90,13 +90,7 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/buttonClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -132,13 +126,7 @@ declare namespace Hmi {
   "outSignature": "6176297704-declare namespace Hmi {\n    class Button {\n        static myStaticFunction(): void;\n    }\n}\n",
   "latestChangedDtsFile": "./Source.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 918
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 878
-=======
-  "size": 913
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 953
 }
 
 //// [/user/username/projects/myproject/SiblingClass/Source.js]
@@ -161,13 +149,7 @@ declare namespace Hmi {
 
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo]
-<<<<<<< HEAD
-{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-{"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"}
-=======
-{"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"}
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+{"fileNames":["../../../../../home/src/tslibs/TS/Lib/lib.d.ts","../buttonClass/Source.d.ts","./Source.ts"],"fileInfos":["3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/myproject/SiblingClass/Source.tsbuildinfo.readable.baseline.txt]
 {
@@ -209,13 +191,7 @@ declare namespace Hmi {
   "outSignature": "-2810380820-declare namespace Hmi {\n    class Sibling {\n        mySiblingFunction(): void;\n    }\n}\n",
   "latestChangedDtsFile": "./Source.d.ts",
   "version": "FakeTSVersion",
-<<<<<<< HEAD
-  "size": 1049
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-  "size": 1009
-=======
-  "size": 1046
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+  "size": 1086
 }
 
 
diff --git a/tests/baselines/reference/tsserver/projectReferences/disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js b/tests/baselines/reference/tsserver/projectReferences/disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
index e1c7b123c0b46..b37ec940f492a 100644
--- a/tests/baselines/reference/tsserver/projectReferences/disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
+++ b/tests/baselines/reference/tsserver/projectReferences/disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
@@ -321,7 +321,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1065,7 +1080,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1295,7 +1325,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/workspaces/dummy/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
diff --git a/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
index 6c4b27697dde6..94b6bc1a39938 100644
--- a/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/project-is-directly-referenced-by-solution.js
@@ -232,7 +232,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1000,7 +1015,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1737,7 +1767,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2170,7 +2215,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2331,7 +2391,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/workspaces/dummy/dummy.ts ProjectRootPath: undefined:: Result: undefined
@@ -3096,7 +3171,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect3/main.ts",
         "configFile": "/user/username/projects/myproject/indirect3/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/indirect3/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] `remove Project::
@@ -3381,7 +3471,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
index 0b5572e4ab347..1316884c4875d 100644
--- a/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/project-is-indirectly-referenced-by-solution.js
@@ -319,7 +319,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1151,7 +1166,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1908,7 +1938,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2349,7 +2394,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2548,7 +2608,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/workspaces/dummy/dummy.ts ProjectRootPath: undefined:: Result: undefined
@@ -2891,7 +2966,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect1.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-indirect2.json, currentDirectory: /user/username/projects/myproject
@@ -2992,7 +3082,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect2.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/target/src/helpers/functions.d.ts 500 undefined WatchType: Closed Script info
@@ -3725,7 +3830,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect3/main.ts",
         "configFile": "/user/username/projects/myproject/indirect3/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/indirect3/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] `remove Project::
@@ -4140,7 +4260,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
@@ -4241,7 +4376,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect1.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-indirect2.json, currentDirectory: /user/username/projects/myproject
@@ -4297,7 +4447,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect2.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Finding references to /user/username/projects/myproject/src/helpers/functions.ts position 13 in project /user/username/projects/myproject/tsconfig-indirect1.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/reusing-d.ts-files-from-composite-and-non-composite-projects.js b/tests/baselines/reference/tsserver/projectReferences/reusing-d.ts-files-from-composite-and-non-composite-projects.js
index d38d7ce6fbaf1..d02d4ccaada4a 100644
--- a/tests/baselines/reference/tsserver/projectReferences/reusing-d.ts-files-from-composite-and-non-composite-projects.js
+++ b/tests/baselines/reference/tsserver/projectReferences/reusing-d.ts-files-from-composite-and-non-composite-projects.js
@@ -222,7 +222,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/compositea/a.ts",
         "configFile": "/user/username/projects/myproject/compositea/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/compositea/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/compositea/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -453,7 +468,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/compositec/c.ts",
         "configFile": "/user/username/projects/myproject/compositec/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/compositec/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/compositec/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project-and-using-declaration-maps.js b/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project-and-using-declaration-maps.js
index 5d9187aac45ee..6fe63a7ab32bb 100644
--- a/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project-and-using-declaration-maps.js
+++ b/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project-and-using-declaration-maps.js
@@ -107,7 +107,7 @@ export {};
 //# sourceMappingURL=keyboard.test.d.ts.map
 
 //// [/user/username/projects/project/out/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../src/common/input/keyboard.ts","../src/common/input/keyboard.test.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-15187822601-function bar() { return \"just a random function so .d.ts location doesnt match\"; }\nexport function evaluateKeyboardEvent() { }","signature":"-14411843863-export declare function evaluateKeyboardEvent(): void;\n"},{"version":"-7258701250-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction testEvaluateKeyboardEvent() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"composite":true,"declarationMap":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./input/keyboard.test.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../src/common/input/keyboard.ts","../src/common/input/keyboard.test.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-15187822601-function bar() { return \"just a random function so .d.ts location doesnt match\"; }\nexport function evaluateKeyboardEvent() { }","signature":"-14411843863-export declare function evaluateKeyboardEvent(): void;\n"},{"version":"-7258701250-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction testEvaluateKeyboardEvent() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"composite":true,"declarationMap":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./input/keyboard.test.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/project/out/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -168,9 +168,23 @@ export {};
       "../src/common/input/keyboard.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/common/input/keyboard.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/common/input/keyboard.test.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./input/keyboard.test.d.ts",
   "version": "FakeTSVersion",
-  "size": 1281
+  "size": 1318
 }
 
 //// [/user/username/projects/project/out/terminal.js]
@@ -190,7 +204,7 @@ export {};
 //# sourceMappingURL=terminal.d.ts.map
 
 //// [/user/username/projects/project/out/src.tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./input/keyboard.d.ts","../src/terminal.ts","./input/keyboard.test.d.ts","../src/common/input/keyboard.test.ts","../src/common/input/keyboard.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-14411843863-export declare function evaluateKeyboardEvent(): void;\n",{"version":"-9992649704-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction foo() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"},"-3531856636-export {};\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"declarationMap":true,"outDir":"./","tsBuildInfoFile":"./src.tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./terminal.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./input/keyboard.d.ts","../src/terminal.ts","./input/keyboard.test.d.ts","../src/common/input/keyboard.test.ts","../src/common/input/keyboard.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-14411843863-export declare function evaluateKeyboardEvent(): void;\n",{"version":"-9992649704-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction foo() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"},"-3531856636-export {};\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"declarationMap":true,"outDir":"./","tsBuildInfoFile":"./src.tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./terminal.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/project/out/src.tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -280,9 +294,27 @@ export {};
       "./input/keyboard.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./input/keyboard.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/terminal.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./input/keyboard.test.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./terminal.d.ts",
   "version": "FakeTSVersion",
-  "size": 1258
+  "size": 1297
 }
 
 
@@ -416,7 +448,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/src/common/input/keyboard.ts",
         "configFile": "/user/username/projects/project/src/common/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/src/common/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/project/src/common/tsconfig.json ProjectRootPath: undefined:: Result: /user/username/projects/project/src/tsconfig.json
@@ -645,7 +692,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/src/terminal.ts",
         "configFile": "/user/username/projects/project/src/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/src/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/project/src/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project.js b/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project.js
index 7da66c20a5553..8b18c3849b0fc 100644
--- a/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project.js
+++ b/tests/baselines/reference/tsserver/projectReferences/root-file-is-file-from-referenced-project.js
@@ -107,7 +107,7 @@ export {};
 //# sourceMappingURL=keyboard.test.d.ts.map
 
 //// [/user/username/projects/project/out/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../src/common/input/keyboard.ts","../src/common/input/keyboard.test.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-15187822601-function bar() { return \"just a random function so .d.ts location doesnt match\"; }\nexport function evaluateKeyboardEvent() { }","signature":"-14411843863-export declare function evaluateKeyboardEvent(): void;\n"},{"version":"-7258701250-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction testEvaluateKeyboardEvent() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"composite":true,"declarationMap":true,"outDir":"./"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./input/keyboard.test.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","../src/common/input/keyboard.ts","../src/common/input/keyboard.test.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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":"-15187822601-function bar() { return \"just a random function so .d.ts location doesnt match\"; }\nexport function evaluateKeyboardEvent() { }","signature":"-14411843863-export declare function evaluateKeyboardEvent(): void;\n"},{"version":"-7258701250-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction testEvaluateKeyboardEvent() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"}],"root":[2,3],"options":{"composite":true,"declarationMap":true,"outDir":"./"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3],"latestChangedDtsFile":"./input/keyboard.test.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/project/out/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -168,9 +168,23 @@ export {};
       "../src/common/input/keyboard.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/common/input/keyboard.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/common/input/keyboard.test.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./input/keyboard.test.d.ts",
   "version": "FakeTSVersion",
-  "size": 1281
+  "size": 1318
 }
 
 //// [/user/username/projects/project/out/terminal.js]
@@ -190,7 +204,7 @@ export {};
 //# sourceMappingURL=terminal.d.ts.map
 
 //// [/user/username/projects/project/out/src.tsconfig.tsbuildinfo]
-{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./input/keyboard.d.ts","../src/terminal.ts","./input/keyboard.test.d.ts","../src/common/input/keyboard.test.ts","../src/common/input/keyboard.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-14411843863-export declare function evaluateKeyboardEvent(): void;\n",{"version":"-9992649704-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction foo() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"},"-3531856636-export {};\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"declarationMap":true,"outDir":"./","tsBuildInfoFile":"./src.tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"latestChangedDtsFile":"./terminal.d.ts","version":"FakeTSVersion"}
+{"fileNames":["../../../../../home/src/tslibs/ts/lib/lib.d.ts","./input/keyboard.d.ts","../src/terminal.ts","./input/keyboard.test.d.ts","../src/common/input/keyboard.test.ts","../src/common/input/keyboard.ts"],"fileIdsList":[[2]],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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},"-14411843863-export declare function evaluateKeyboardEvent(): void;\n",{"version":"-9992649704-import { evaluateKeyboardEvent } from 'common/input/keyboard';\nfunction foo() {\n    return evaluateKeyboardEvent();\n}\n","signature":"-3531856636-export {};\n"},"-3531856636-export {};\n"],"root":[[2,4]],"resolvedRoot":[[4,5],[2,6]],"options":{"composite":true,"declarationMap":true,"outDir":"./","tsBuildInfoFile":"./src.tsconfig.tsbuildinfo"},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[1,2,3,4],"latestChangedDtsFile":"./terminal.d.ts","version":"FakeTSVersion"}
 
 //// [/user/username/projects/project/out/src.tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -280,9 +294,27 @@ export {};
       "./input/keyboard.d.ts"
     ]
   },
+  "semanticDiagnosticsPerFile": [
+    [
+      "../../../../../home/src/tslibs/ts/lib/lib.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./input/keyboard.d.ts",
+      "not cached or not changed"
+    ],
+    [
+      "../src/terminal.ts",
+      "not cached or not changed"
+    ],
+    [
+      "./input/keyboard.test.d.ts",
+      "not cached or not changed"
+    ]
+  ],
   "latestChangedDtsFile": "./terminal.d.ts",
   "version": "FakeTSVersion",
-  "size": 1258
+  "size": 1297
 }
 
 
@@ -416,7 +448,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/src/common/input/keyboard.ts",
         "configFile": "/user/username/projects/project/src/common/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/src/common/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/project/src/common/tsconfig.json ProjectRootPath: undefined:: Result: /user/username/projects/project/src/tsconfig.json
@@ -642,7 +689,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/project/src/terminal.ts",
         "configFile": "/user/username/projects/project/src/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 6,
+              "offset": 5
+            },
+            "end": {
+              "line": 6,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/project/src/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/project/src/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
index f2412f04852b4..24546f9818ad7 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-first-indirect-project-but-not-in-another-one.js
@@ -340,7 +340,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -438,7 +453,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1287,7 +1317,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -1340,7 +1385,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1599,7 +1659,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots
@@ -1655,7 +1730,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/workspaces/dummy/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
index 1e88910430066..a79c8999801cb 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set-in-indirect-project.js
@@ -293,7 +293,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -1030,7 +1045,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -1254,7 +1284,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
index d3dbabf2286dc..cf4918af62e33 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-disables-looking-into-the-child-project-if-disableReferencedProjectLoad-is-set.js
@@ -251,7 +251,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -918,7 +933,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
@@ -1112,7 +1142,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/tsconfig.json ProjectRootPath: undefined:: Result: undefined
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
index 4b57bc630c469..ef9b28841e1fd 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-found-is-not-solution-but-references-open-file-through-project-reference.js
@@ -248,7 +248,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -346,7 +361,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1179,7 +1209,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -1232,7 +1277,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1741,6 +1801,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 7,
@@ -1962,7 +2036,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig-src.json
@@ -1996,7 +2085,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2350,7 +2454,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2521,7 +2640,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots
@@ -2577,7 +2711,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/workspaces/dummy/dummy.ts ProjectRootPath: undefined:: Result: undefined
@@ -3328,7 +3477,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect3/main.ts",
         "configFile": "/user/username/projects/myproject/indirect3/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/indirect3/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] `remove Project::
@@ -3644,7 +3808,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -3697,7 +3876,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
index 40018546cfc00..b87a60035874f 100644
--- a/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
+++ b/tests/baselines/reference/tsserver/projectReferences/solution-with-its-own-files-and-project-is-indirectly-referenced-by-solution.js
@@ -338,7 +338,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -436,7 +451,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1373,7 +1403,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -1426,7 +1471,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/tsconfig.json' (Configured)
@@ -1997,6 +2057,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          },
           {
             "start": {
               "line": 11,
@@ -2285,7 +2359,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: /user/username/projects/myproject/tsconfig-src.json
@@ -2319,7 +2408,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2733,7 +2837,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -2946,7 +3065,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig-src.json WatchType: Type roots
@@ -3002,7 +3136,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-src.json",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/workspaces/dummy/dummy.ts ProjectRootPath: undefined:: Result: undefined
@@ -3265,7 +3414,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect1/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect1.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/indirect1/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
@@ -3371,7 +3535,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect2.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/target/src/helpers/functions.d.ts 500 undefined WatchType: Closed Script info
@@ -4144,7 +4323,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect3/main.ts",
         "configFile": "/user/username/projects/myproject/indirect3/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/indirect3/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] `remove Project::
@@ -4600,7 +4794,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig.json",
         "configFile": "/user/username/projects/myproject/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Creating ConfiguredProject: /user/username/projects/myproject/tsconfig-src.json, currentDirectory: /user/username/projects/myproject
@@ -4653,7 +4862,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-src.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-src.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
@@ -4719,7 +4943,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/indirect1/main.ts",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect1.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect1.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /user/username/projects/myproject/indirect1/main.ts ProjectRootPath: undefined:: Result: /user/username/projects/myproject/tsconfig.json
@@ -4784,7 +5023,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
         "configFile": "/user/username/projects/myproject/tsconfig-indirect2.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 5,
+              "offset": 5
+            },
+            "end": {
+              "line": 5,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/tsconfig-indirect2.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Finding references to /user/username/projects/myproject/src/helpers/functions.ts position 13 in project /user/username/projects/myproject/tsconfig-indirect2.json
diff --git a/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project-and-shared-is-first.js b/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project-and-shared-is-first.js
index c4064037cfa37..07a9003a10775 100644
--- a/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project-and-shared-is-first.js
+++ b/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project-and-shared-is-first.js
@@ -258,7 +258,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/solution/projects/server/src/server.ts",
         "configFile": "/home/src/workspaces/solution/projects/server/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/solution/projects/server/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/solution/projects/server/tsconfig.json ProjectRootPath: undefined:: Result: /home/src/workspaces/solution/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project.js b/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project.js
index b4afe06ddfdb7..fbeaf2fa1d0a0 100644
--- a/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project.js
+++ b/tests/baselines/reference/tsserver/projectRootFiles/when-root-file-is-from-referenced-project.js
@@ -258,7 +258,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/home/src/workspaces/solution/projects/server/src/server.ts",
         "configFile": "/home/src/workspaces/solution/projects/server/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/workspaces/solution/projects/server/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] getConfigFileNameForFile:: File: /home/src/workspaces/solution/projects/server/tsconfig.json ProjectRootPath: undefined:: Result: /home/src/workspaces/solution/tsconfig.json
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
index 5d1b0d6fedcc6..e536c8e226ed6 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
@@ -265,7 +265,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -409,6 +424,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          },
           {
             "start": {
               "line": 14,
@@ -637,7 +666,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
index 8eb6ae7df5675..699ed7a3c0fa8 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
@@ -265,7 +265,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -396,6 +411,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          },
           {
             "start": {
               "line": 15,
@@ -517,7 +546,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
index fedbf7bbd9f2c..b61ea5f192ef4 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
@@ -265,7 +265,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
index 5a860f36992f9..40d2f5b1cdc36 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
@@ -265,7 +265,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -477,7 +492,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -698,7 +728,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
index f6ba8da0e8d2d..15380d6f50c75 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
@@ -265,7 +265,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
index 0e536047a1d5c..4d70e37f9a7c5 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
@@ -262,7 +262,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -416,6 +431,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          },
           {
             "start": {
               "line": 11,
@@ -647,7 +676,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
index fa6b575db7a02..64e24713dd7d5 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
@@ -262,7 +262,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -401,6 +416,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          },
           {
             "start": {
               "line": 12,
@@ -521,7 +550,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
index 9d42eefdc79f5..8f9d243fa81de 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
@@ -262,7 +262,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
index 343930355e1c8..8322c45e5d9ed 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
@@ -262,7 +262,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
@@ -473,7 +488,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
@@ -693,7 +723,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/tsconfig.json",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
index 4130cd73a6693..010f9de325a36 100644
--- a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
@@ -262,7 +262,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/c/index.ts",
         "configFile": "/user/username/projects/myproject/c/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 3,
+              "offset": 5
+            },
+            "end": {
+              "line": 3,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/user/username/projects/myproject/c/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/c/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 c8f098e474e4c..008008a85a8dc 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
@@ -210,26 +210,6 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
-<<<<<<< HEAD
-        "diagnostics": []
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        "diagnostics": [
-          {
-            "start": {
-              "line": 7,
-              "offset": 5
-            },
-            "end": {
-              "line": 7,
-              "offset": 14
-            },
-            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
-            "code": 5101,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          }
-        ]
-=======
         "diagnostics": [
           {
             "start": {
@@ -274,7 +254,6 @@ Info seq  [hh:mm:ss:mss] event:
             "fileName": "/user/username/projects/myproject/src/tsconfig.json"
           }
         ]
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
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 992bba9bf7d40..818d9d2ac8011 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,26 +222,6 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/user/username/projects/myproject/src/somefolder/srcfile.ts",
         "configFile": "/user/username/projects/myproject/src/tsconfig.json",
-<<<<<<< HEAD
-        "diagnostics": []
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-        "diagnostics": [
-          {
-            "start": {
-              "line": 7,
-              "offset": 5
-            },
-            "end": {
-              "line": 7,
-              "offset": 14
-            },
-            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
-            "code": 5101,
-            "category": "error",
-            "fileName": "/user/username/projects/myproject/src/tsconfig.json"
-          }
-        ]
-=======
         "diagnostics": [
           {
             "start": {
@@ -286,7 +266,6 @@ Info seq  [hh:mm:ss:mss] event:
             "fileName": "/user/username/projects/myproject/src/tsconfig.json"
           }
         ]
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
index b96b40338f005..148d1cc86a7f7 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
@@ -200,7 +200,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts",
         "configFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json' (Configured)
@@ -822,7 +837,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json",
         "configFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Running: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
index 3c9e91e83b262..4e61e25bd6e1e 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-has-node_modules-setup-but-doesnt-have-modules-in-typings-folder-and-then-recompiles.js
@@ -204,7 +204,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts",
         "configFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
index 5d166f6097b5a..db3d46ae5cfe2 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-recompiles-after-deleting-generated-folders.js
@@ -187,7 +187,22 @@ Info seq  [hh:mm:ss:mss] event:
       "body": {
         "triggerFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/src/datetime/baseDate.ts",
         "configFile": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json",
-        "diagnostics": []
+        "diagnostics": [
+          {
+            "start": {
+              "line": 4,
+              "offset": 5
+            },
+            "end": {
+              "line": 4,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json"
+          }
+        ]
       }
     }
 Info seq  [hh:mm:ss:mss] Project '/users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json' (Configured)
diff --git a/tests/baselines/reference/tsserver/symlinkCache/contains-symlinks-discovered-by-project-references-resolution-after-program-creation.js b/tests/baselines/reference/tsserver/symlinkCache/contains-symlinks-discovered-by-project-references-resolution-after-program-creation.js
index 0a3aec54b72c2..89bc4e28c1676 100644
--- a/tests/baselines/reference/tsserver/symlinkCache/contains-symlinks-discovered-by-project-references-resolution-after-program-creation.js
+++ b/tests/baselines/reference/tsserver/symlinkCache/contains-symlinks-discovered-by-project-references-resolution-after-program-creation.js
@@ -219,6 +219,20 @@ Info seq  [hh:mm:ss:mss] event:
         "triggerFile": "/home/src/projects/project/packages/app/src/index.ts",
         "configFile": "/home/src/projects/project/packages/app/tsconfig.json",
         "diagnostics": [
+          {
+            "start": {
+              "line": 7,
+              "offset": 17
+            },
+            "end": {
+              "line": 7,
+              "offset": 26
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/packages/app/tsconfig.json"
+          },
           {
             "start": {
               "line": 9,
diff --git a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
index ff4f855b6f564..1c6104895572a 100644
--- a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
+++ b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
@@ -300,6 +300,20 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/home/src/projects/project/tsconfig.json"
           },
+          {
+            "start": {
+              "line": 7,
+              "offset": 5
+            },
+            "end": {
+              "line": 7,
+              "offset": 14
+            },
+            "text": "Option 'baseUrl' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '\"ignoreDeprecations\": \"6.0\"' to silence this error.\n  Visit https://aka.ms/ts6 for migration information.",
+            "code": 5101,
+            "category": "error",
+            "fileName": "/home/src/projects/project/tsconfig.json"
+          },
           {
             "start": {
               "line": 17,
diff --git a/tests/baselines/reference/tsxAttributeResolution10.js b/tests/baselines/reference/tsxAttributeResolution10.js
index b5111b9e7bec6..700b96a4787b4 100644
--- a/tests/baselines/reference/tsxAttributeResolution10.js
+++ b/tests/baselines/reference/tsxAttributeResolution10.js
@@ -31,54 +31,13 @@ export class MyComponent {
 
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MyComponent = void 0;
-    class MyComponent {
-        render() {
-        }
-    }
-    exports.MyComponent = MyComponent;
-    // Should be an error
-    <MyComponent bar='world'/>;
-    // Should be OK
-    <MyComponent bar={true}/>;
-    // Should be ok
-    <MyComponent data-bar='hello'/>;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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'/>;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = void 0;
-var MyComponent = /** @class */ (function () {
-    function MyComponent() {
+class MyComponent {
+    render() {
     }
-    MyComponent.prototype.render = function () {
-    };
-    return MyComponent;
-}());
+}
 exports.MyComponent = MyComponent;
 // Should be an error
 <MyComponent bar='world'/>;
@@ -86,4 +45,3 @@ exports.MyComponent = MyComponent;
 <MyComponent bar={true}/>;
 // Should be ok
 <MyComponent data-bar='hello'/>;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxAttributeResolution9.js b/tests/baselines/reference/tsxAttributeResolution9.js
index 4871daadd2d73..0b74500018198 100644
--- a/tests/baselines/reference/tsxAttributeResolution9.js
+++ b/tests/baselines/reference/tsxAttributeResolution9.js
@@ -27,47 +27,13 @@ export class MyComponent {
 
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MyComponent = void 0;
-    class MyComponent {
-        render() {
-        }
-    }
-    exports.MyComponent = MyComponent;
-    <MyComponent foo="bar"/>; // ok  
-    <MyComponent foo={0}/>; // should be an error
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyComponent = void 0;
-var MyComponent = /** @class */ (function () {
-    function MyComponent() {
+class MyComponent {
+    render() {
     }
-    MyComponent.prototype.render = function () {
-    };
-    return MyComponent;
-}());
+}
 exports.MyComponent = MyComponent;
 <MyComponent foo="bar"/>; // ok  
 <MyComponent foo={0}/>; // should be an error
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxElementResolution17.errors.txt b/tests/baselines/reference/tsxElementResolution17.errors.txt
index a8d7b896a9ba4..650b7474e6a80 100644
--- a/tests/baselines/reference/tsxElementResolution17.errors.txt
+++ b/tests/baselines/reference/tsxElementResolution17.errors.txt
@@ -10,7 +10,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     <s1.MyElement />;
     
 ==== file.tsx (0 errors) ====
-    declare namespace JSX {
+    declare module JSX {
     	interface Element { }
     	interface IntrinsicElements { }
     }
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index a22df6da4fc09..96bd199c1fc3f 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -20,123 +20,16 @@ import {MyClass} from './file1';
 
 
 //// [file1.js]
-<<<<<<< HEAD
-define(["require", "exports"], function (require, exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MyClass = void 0;
-    class MyClass {
-    }
-    exports.MyClass = MyClass;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var MyClass = /** @class */ (function () {
-    function MyClass() {
-    }
-    return MyClass;
-}());
+class MyClass {
+}
 exports.MyClass = MyClass;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
 //// [file2.js]
-<<<<<<< HEAD
-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);
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (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", "react", "./file1"], function (require, exports, React, file1_1) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    React = __importStar(React);
-    React.createElement(file1_1.MyClass, null);
-});
-=======
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 React = require("react");
 var file1_1 = require("./file1");
 React.createElement(file1_1.MyClass, null);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/tsxPreserveEmit1.errors.txt b/tests/baselines/reference/tsxPreserveEmit1.errors.txt
index cad606d8c3434..460bf3848d3e3 100644
--- a/tests/baselines/reference/tsxPreserveEmit1.errors.txt
+++ b/tests/baselines/reference/tsxPreserveEmit1.errors.txt
@@ -11,10 +11,10 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     
     var routes1 = <Route />;
     
-    namespace M {
+    module M {
     	export var X: any;
     }
-    namespace M {
+    module M {
     	// Should emit 'M.X' in both opening and closing tags
     	var y = <X></X>;
     }
@@ -25,7 +25,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
     	export = x;
     }
     
-    declare namespace ReactRouter {
+    declare module ReactRouter {
     	var Route: any;
     	interface Thing { }
     }
diff --git a/tests/baselines/reference/tsxPreserveEmit3.errors.txt b/tests/baselines/reference/tsxPreserveEmit3.errors.txt
index 581d5de36c4de..266b00a1d1ea8 100644
--- a/tests/baselines/reference/tsxPreserveEmit3.errors.txt
+++ b/tests/baselines/reference/tsxPreserveEmit3.errors.txt
@@ -3,7 +3,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 {
+    declare module JSX {
     	interface Element { }
     	interface IntrinsicElements {
     		[s: string]: any;
diff --git a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
index 04eeb0b11d5d3..ad080039bf23b 100644
--- a/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
+++ b/tests/baselines/reference/tsxSfcReturnUndefinedStrictNullChecks.js
@@ -13,39 +13,13 @@ const foo = <Foo />;
 const G = <Greet />;
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports", "react"], function (require, exports, React) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    const Foo = (props) => undefined;
-    function Greet(x) {
-        return undefined;
-    }
-    // Error
-    const foo = <Foo />;
-    const G = <Greet />;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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 />;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
-var Foo = function (props) { return undefined; };
+const Foo = (props) => undefined;
 function Greet(x) {
     return undefined;
 }
 // Error
-var foo = <Foo />;
-var G = <Greet />;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+const foo = <Foo />;
+const G = <Greet />;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
index 4aceb0c98758a..f4f7134fd7b80 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload4.js
@@ -40,84 +40,28 @@ const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>
 
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports", "react"], function (require, exports, React) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    let obj = {
-        yy: 10,
-        yy1: "hello"
-    };
-    let obj2;
-    // Error
-    const c0 = <OneThing extraProp/>; // extra property;
-    const c1 = <OneThing yy={10}/>; // missing property;
-    const c2 = <OneThing {...obj} yy1/>; // type incompatible;
-    const c3 = <OneThing {...obj} {...{ extra: "extra attr" }}/>; //  This is OK because all attribute are spread
-    const c4 = <OneThing {...obj} y1={10000}/>; // extra property;
-    const c5 = <OneThing {...obj} {...{ yy: true }}/>; // type incompatible;
-    const c6 = <OneThing {...obj2} {...{ extra: "extra attr" }}/>; // Should error as there is extra attribute that doesn't match any. Current it is not
-    const c7 = <OneThing {...obj2} yy/>; // Should error as there is extra attribute that doesn't match any. Current it is not
-    // Error
-    const d1 = <TestingOneThing extra-data/>;
-    const d2 = <TestingOneThing yy="hello" direction="left"/>;
-    // Error
-    const e1 = <TestingOptional y1 y3="hello"/>;
-    const e2 = <TestingOptional y1="hello" y2={1000} y3/>;
-    const e3 = <TestingOptional y1="hello" y2={1000} children="hi"/>;
-    const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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>;
-});
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
-var obj = {
+let obj = {
     yy: 10,
     yy1: "hello"
 };
-var obj2;
+let 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
+const c0 = <OneThing extraProp/>; // extra property;
+const c1 = <OneThing yy={10}/>; // missing property;
+const c2 = <OneThing {...obj} yy1/>; // type incompatible;
+const c3 = <OneThing {...obj} {...{ extra: "extra attr" }}/>; //  This is OK because all attribute are spread
+const c4 = <OneThing {...obj} y1={10000}/>; // extra property;
+const c5 = <OneThing {...obj} {...{ yy: true }}/>; // type incompatible;
+const c6 = <OneThing {...obj2} {...{ extra: "extra attr" }}/>; // Should error as there is extra attribute that doesn't match any. Current it is not
+const 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"/>;
+const d1 = <TestingOneThing extra-data/>;
+const 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>;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+const e1 = <TestingOptional y1 y3="hello"/>;
+const e2 = <TestingOptional y1="hello" y2={1000} y3/>;
+const e3 = <TestingOptional y1="hello" y2={1000} children="hi"/>;
+const e4 = <TestingOptional y1="hello" y2={1000}>Hi</TestingOptional>;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
index 9d9efd2dbb8f4..f695bfda078ad 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload5.js
@@ -59,107 +59,35 @@ const b7 = <MainButton {...{ onClick(e: any){} }} children="hello" className />;
 const b8 = <MainButton data-format />;  // incorrect type for specified hyphanated name
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports", "react"], function (require, exports, React) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MainButton = MainButton;
-    let obj0 = {
-        to: "world"
-    };
-    let obj1 = {
-        children: "hi",
-        to: "boo"
-    };
-    let obj2 = {
-        onClick: () => { }
-    };
-    let obj3;
-    function MainButton(props) {
-        const linkProps = props;
-        if (linkProps.to) {
-            return this._buildMainLink(props);
-        }
-        return this._buildMainButton(props);
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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);
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
 var React = require("react");
-var obj0 = {
+let obj0 = {
     to: "world"
 };
-var obj1 = {
+let obj1 = {
     children: "hi",
     to: "boo"
 };
-var obj2 = {
-    onClick: function () { }
+let obj2 = {
+    onClick: () => { }
 };
-var obj3;
+let obj3;
 function MainButton(props) {
-    var linkProps = props;
+    const linkProps = props;
     if (linkProps.to) {
         return this._buildMainLink(props);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
-<<<<<<< HEAD
-    // Error
-    const b0 = <MainButton to='/some/path' onClick={(e) => { }}>GO</MainButton>; // extra property;
-    const b1 = <MainButton onClick={(e) => { }} {...obj0}>Hello world</MainButton>; // extra property;
-    const b2 = <MainButton {...{ to: "10000" }} {...obj2}/>; // extra property
-    const b3 = <MainButton {...{ to: "10000" }} {...{ onClick: (k) => { } }}/>; // extra property
-    const b4 = <MainButton {...obj3} to/>; // Should error because Incorrect type; but attributes are any so everything is allowed
-    const b5 = <MainButton {...{ onClick(e) { } }} {...obj0}/>; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes
-    const b6 = <MainButton {...{ onClick(e) { } }} children={10}/>; // incorrect type for optional attribute
-    const b7 = <MainButton {...{ onClick(e) { } }} children="hello" className/>; // incorrect type for optional attribute
-    const b8 = <MainButton data-format/>; // incorrect type for specified hyphanated name
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    // 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
-});
-=======
     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
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+const b0 = <MainButton to='/some/path' onClick={(e) => { }}>GO</MainButton>; // extra property;
+const b1 = <MainButton onClick={(e) => { }} {...obj0}>Hello world</MainButton>; // extra property;
+const b2 = <MainButton {...{ to: "10000" }} {...obj2}/>; // extra property
+const b3 = <MainButton {...{ to: "10000" }} {...{ onClick: (k) => { } }}/>; // extra property
+const b4 = <MainButton {...obj3} to/>; // Should error because Incorrect type; but attributes are any so everything is allowed
+const b5 = <MainButton {...{ onClick(e) { } }} {...obj0}/>; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes
+const b6 = <MainButton {...{ onClick(e) { } }} children={10}/>; // incorrect type for optional attribute
+const b7 = <MainButton {...{ onClick(e) { } }} children="hello" className/>; // incorrect type for optional attribute
+const 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 cff94191ed053..f22def1dfed91 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentOverload6.js
@@ -60,110 +60,36 @@ const b12 = <MainButton data-format="Hello world" />
 
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports", "react"], function (require, exports, React) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.MainButton = MainButton;
-    let obj = {
-        children: "hi",
-        to: "boo"
-    };
-    let obj1;
-    let obj2 = {
-        onClick: () => { }
-    };
-    function MainButton(props) {
-        const linkProps = props;
-        if (linkProps.to) {
-            return this._buildMainLink(props);
-        }
-        return this._buildMainButton(props);
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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);
-=======
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainButton = MainButton;
 var React = require("react");
-var obj = {
+let obj = {
     children: "hi",
     to: "boo"
 };
-var obj1;
-var obj2 = {
-    onClick: function () { }
+let obj1;
+let obj2 = {
+    onClick: () => { }
 };
 function MainButton(props) {
-    var linkProps = props;
+    const linkProps = props;
     if (linkProps.to) {
         return this._buildMainLink(props);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
     }
-<<<<<<< HEAD
-    // OK
-    const b0 = <MainButton to='/some/path'>GO</MainButton>;
-    const b1 = <MainButton onClick={(e) => { }}>Hello world</MainButton>;
-    const b2 = <MainButton {...obj}/>;
-    const b3 = <MainButton {...{ to: 10000 }} {...obj}/>;
-    const b4 = <MainButton {...obj1}/>; // any; just pick the first overload
-    const b5 = <MainButton {...obj1} to="/to/somewhere"/>; // should pick the second overload
-    const b6 = <MainButton {...obj2}/>;
-    const b7 = <MainButton {...{ onClick: () => { console.log("hi"); } }}/>;
-    const b8 = <MainButton {...{ onClick() { } }}/>; // OK; method declaration get retained (See GitHub #13365)
-    const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
-    const b10 = <MainButton to='/some/path' children="hi"></MainButton>;
-    const b11 = <MainButton onClick={(e) => { }} className="hello" data-format>Hello world</MainButton>;
-    const b12 = <MainButton data-format="Hello world"/>;
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-    // 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"/>;
-});
-=======
     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"/>;
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
+const b0 = <MainButton to='/some/path'>GO</MainButton>;
+const b1 = <MainButton onClick={(e) => { }}>Hello world</MainButton>;
+const b2 = <MainButton {...obj}/>;
+const b3 = <MainButton {...{ to: 10000 }} {...obj}/>;
+const b4 = <MainButton {...obj1}/>; // any; just pick the first overload
+const b5 = <MainButton {...obj1} to="/to/somewhere"/>; // should pick the second overload
+const b6 = <MainButton {...obj2}/>;
+const b7 = <MainButton {...{ onClick: () => { console.log("hi"); } }}/>;
+const b8 = <MainButton {...{ onClick() { } }}/>; // OK; method declaration get retained (See GitHub #13365)
+const b9 = <MainButton to='/some/path' extra-prop>GO</MainButton>;
+const b10 = <MainButton to='/some/path' children="hi"></MainButton>;
+const b11 = <MainButton onClick={(e) => { }} className="hello" data-format>Hello world</MainButton>;
+const b12 = <MainButton data-format="Hello world"/>;
diff --git a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
index 056be9ca1b307..2ab45f2cba9cf 100644
--- a/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
+++ b/tests/baselines/reference/tsxStatelessFunctionComponentsWithTypeArguments4.js
@@ -14,33 +14,11 @@ function Baz<T extends {b: number}, U extends {a: boolean, b:string}>(arg1: T, a
 }
 
 //// [file.jsx]
-<<<<<<< HEAD
-define(["require", "exports", "react"], function (require, exports, React) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    // Error
-    function Baz(arg1, arg2) {
-        let a0 = <OverloadComponent a={arg1.b}/>;
-        let a2 = <OverloadComponent {...arg1} ignore-prop/>; // missing a
-    }
-});
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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
-    }
-});
-=======
 "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
+    let a0 = <OverloadComponent a={arg1.b}/>;
+    let a2 = <OverloadComponent {...arg1} ignore-prop/>; // missing a
 }
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
diff --git a/tests/baselines/reference/typeResolution.errors.txt b/tests/baselines/reference/typeResolution.errors.txt
index f6d8947e4958a..8b0c9aacacfcd 100644
--- a/tests/baselines/reference/typeResolution.errors.txt
+++ b/tests/baselines/reference/typeResolution.errors.txt
@@ -3,9 +3,9 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
 
 !!! 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 module TopLevelModule1 {
+        export module SubModule1 {
+            export module SubSubModule1 {
                 export class ClassA {
                     public AisIn1_1_1() {
                         // Try all qualified names of this type
@@ -78,8 +78,8 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
             }
         }
     
-        export namespace SubModule2 {
-            export namespace SubSubModule2 {
+        export module SubModule2 {
+            export module 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() { } }
@@ -99,13 +99,13 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
             YisIn1();
         }
         
-        namespace NotExportedModule {
+        module NotExportedModule {
             export class ClassA { }
         }
     }
     
-    namespace TopLevelModule2 {
-        export namespace SubModule3 {
+    module TopLevelModule2 {
+        export module SubModule3 {
             export class ClassA {
                 public AisIn2_3() { }
             }
diff --git a/tests/baselines/reference/typesVersions.emptyTypes.errors.txt b/tests/baselines/reference/typesVersions.emptyTypes.errors.txt
new file mode 100644
index 0000000000000..798dabe02a251
--- /dev/null
+++ b/tests/baselines/reference/typesVersions.emptyTypes.errors.txt
@@ -0,0 +1,20 @@
+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 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.
+==== /a/package.json (0 errors) ====
+    {
+        "types": "",
+        "typesVersions": {
+            ">=3.1.0-0": { "*" : ["ts3.1/*"] }
+        }
+    }
+    
+==== /a/ts3.1/index.d.ts (0 errors) ====
+    export const a = 0;
+    
+==== /b/user.ts (0 errors) ====
+    import { a } from "a";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/typesVersions.justIndex.errors.txt b/tests/baselines/reference/typesVersions.justIndex.errors.txt
new file mode 100644
index 0000000000000..55154bbccf43f
--- /dev/null
+++ b/tests/baselines/reference/typesVersions.justIndex.errors.txt
@@ -0,0 +1,19 @@
+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 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.
+==== /a/package.json (0 errors) ====
+    {
+        "typesVersions": {
+            ">=3.1.0-0": { "*" : ["ts3.1/*"] }
+        }
+    }
+    
+==== /a/ts3.1/index.d.ts (0 errors) ====
+    export const a = 0;
+    
+==== /b/user.ts (0 errors) ====
+    import { a } from "a";
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/undeclaredModuleError.js b/tests/baselines/reference/undeclaredModuleError.js
index f82d4ab226310..681cef3317ee8 100644
--- a/tests/baselines/reference/undeclaredModuleError.js
+++ b/tests/baselines/reference/undeclaredModuleError.js
@@ -18,55 +18,17 @@ function instrumentFile(covFileDir: string, covFileName: string, originalFilePat
 }
 
 //// [undeclaredModuleError.js]
-<<<<<<< HEAD
-define(["require", "exports", "fs"], function (require, exports, fs) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    function readdir(path, accept, callback) { }
-    function join(...paths) { }
-    function instrumentFile(covFileDir, covFileName, originalFilePath) {
-        fs.readFile(originalFilePath, () => {
-            readdir(covFileDir, () => {
-            }, (error, files) => {
-                files.forEach((file) => {
-                    var fullPath = join(IDoNotExist);
-                });
-||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
-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);
-                });
-=======
 "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];
-    }
-}
+function join(...paths) { }
 function instrumentFile(covFileDir, covFileName, originalFilePath) {
-    fs.readFile(originalFilePath, function () {
-        readdir(covFileDir, function () {
-        }, function (error, files) {
-            files.forEach(function (file) {
+    fs.readFile(originalFilePath, () => {
+        readdir(covFileDir, () => {
+        }, (error, files) => {
+            files.forEach((file) => {
                 var fullPath = join(IDoNotExist);
->>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669))
             });
         });
     });
diff --git a/tests/baselines/reference/withExportDecl.errors.txt b/tests/baselines/reference/withExportDecl.errors.txt
index 2b16d72472e8b..b4844fcc090eb 100644
--- a/tests/baselines/reference/withExportDecl.errors.txt
+++ b/tests/baselines/reference/withExportDecl.errors.txt
@@ -40,18 +40,18 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         return simpleFunction();
     }
     
-    namespace m1 {
+    module m1 {
         export function foo() {
             return "Hello";
         }
     }
-    export declare namespace m2 {
+    export declare module m2 {
     
         export var a: number;
     }
     
     
-    export namespace m3 {
+    export module m3 {
     
         export function foo() {
             return m1.foo();
diff --git a/tests/baselines/reference/withImportDecl.errors.txt b/tests/baselines/reference/withImportDecl.errors.txt
index a587af11cfe88..24b471da9c41b 100644
--- a/tests/baselines/reference/withImportDecl.errors.txt
+++ b/tests/baselines/reference/withImportDecl.errors.txt
@@ -31,7 +31,7 @@ error TS5107: Option 'module=AMD' is deprecated and will stop functioning in Typ
         };
     }
     
-    namespace m1 {
+    module m1 {
         export function foo() {
             return "Hello";
         }

From 19fc4927e6993f670b66910ec1859e6f10237a42 Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrewbranch@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:50:03 -0700
Subject: [PATCH 3/3] Deprecate esModuleInterop and
 allowSyntheticDefaultImports (default to true) (#62567)

---
 src/compiler/commandLineParser.ts             |   4 +-
 src/compiler/program.ts                       |  10 +-
 src/compiler/utilities.ts                     |  18 +-
 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 +++-
 .../allowImportClausesToMergeWithTypes.js     |  12 +-
 .../allowSyntheticDefaultImports1.js          |   5 +-
 .../allowSyntheticDefaultImports3.errors.txt  |   2 +
 .../allowSyntheticDefaultImports4.js          |   5 +-
 .../allowSyntheticDefaultImports6.errors.txt  |   2 +
 .../allowSyntheticDefaultImports8.errors.txt  |   2 +
 .../allowSyntheticDefaultImports9.js          |   5 +-
 .../reference/ambientDeclarationsPatterns.js  |   5 +-
 tests/baselines/reference/ambientShorthand.js |  37 +++-
 .../reference/ambientShorthand_reExport.js    |  35 +++-
 .../reference/amdDependencyCommentName4.js    |  38 ++++
 ...NamespaceIdentifiers_module(module=amd).js |  35 +++-
 ...paceIdentifiers_module(module=commonjs).js |  35 +++-
 ...amespaceIdentifiers_module(module=none).js |  35 +++-
 ...NamespaceIdentifiers_module(module=umd).js |  35 +++-
 .../assertionFunctionWildcardImport1.js       | 105 +++++++++-
 .../assertionFunctionWildcardImport2.js       |  35 +++-
 .../reference/asyncImportNestedYield.js       |  35 +++-
 .../reference/augmentExportEquals3.js         |  35 +++-
 .../reference/augmentExportEquals3_1.js       |  34 +++
 .../reference/augmentExportEquals4.js         |  35 +++-
 .../reference/augmentExportEquals4_1.js       |  34 +++
 .../reference/augmentExportEquals5.types      |   4 +-
 .../reference/augmentExportEquals6.js         |  35 +++-
 .../reference/augmentExportEquals7.types      |   4 +-
 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 +++-
 .../tsconfig.json                             |   1 -
 .../module/tsconfig.json                      |   1 -
 .../moduleResolution/tsconfig.json            |   1 -
 ...lictingDeclarationsImportFromNamespace1.js |  35 +++-
 ...lictingDeclarationsImportFromNamespace2.js |  35 +++-
 ...nceCausesNoImport(isolatedmodules=true).js |  35 +++-
 ...stEnumNamespaceReferenceCausesNoImport2.js |  35 +++-
 ...clarationEmitAnyComputedPropertyInClass.js |   5 +-
 ...clarationEmitComputedNameConstEnumAlias.js |   5 +-
 ...rationEmitExportAliasVisibiilityMarking.js |  35 +++-
 .../declarationEmitExpressionInExtends6.js    |  35 +++-
 ...dTypeDistributivityPreservesConstraints.js |   5 +-
 ...ationEmitMappedTypeTemplateTypeofSymbol.js |  35 +++-
 ...larationEmitObjectAssignedDefaultExport.js |   5 +-
 .../declarationEmitOfTypeofAliasedExport.js   |  35 +++-
 ...RetainedAnnotationRetainsImportInOutput.js |  35 +++-
 .../declarationEmitTypeofDefaultExport.js     |  35 +++-
 ...eclarationEmitWithDefaultAsComputedName.js |   5 +-
 ...clarationEmitWithDefaultAsComputedName2.js |  35 +++-
 ...eForJsonImport(resolvejsonmodule=false).js |   5 +-
 ...leForJsonImport(resolvejsonmodule=true).js |   5 +-
 ...arationsIndirectGeneratedAliasReference.js |  38 +++-
 .../baselines/reference/decoratorMetadata.js  |   5 +-
 ...dataWithImportDeclarationNameCollision4.js |   2 +-
 ...dataWithImportDeclarationNameCollision5.js |   2 +-
 ...dataWithImportDeclarationNameCollision6.js |   2 +-
 ...dataWithImportDeclarationNameCollision7.js |   2 +-
 ...ltDeclarationEmitShadowedNamedCorrectly.js |  35 +++-
 .../defaultExportInAwaitExpression01.js       |   5 +-
 .../defaultExportInAwaitExpression02.js       |   5 +-
 .../reference/defaultExportsCannotMerge01.js  |   5 +-
 .../reference/defaultExportsCannotMerge02.js  |   5 +-
 .../reference/defaultExportsCannotMerge03.js  |   5 +-
 ...cateObjectLiteralProperty_computedName3.js |  35 +++-
 .../duplicatePackage_referenceTypes.js        |  35 +++-
 .../reference/duplicatePackage_subModule.js   |  35 +++-
 .../dynamicImportEvaluateSpecifier.js         |  39 +++-
 .../dynamicImportInDefaultExportExpression.js |  35 +++-
 .../reference/dynamicImportTrailingComma.js   |  35 +++-
 .../dynamicImportWithNestedThis_es2015.js     |  35 +++-
 .../dynamicImportWithNestedThis_es5.js        |  35 +++-
 ...tadata_isolatedModules(module=commonjs).js |  35 +++-
 .../emitModuleCommonJS(module=commonjs).js    |  74 ++++++-
 tests/baselines/reference/emptyModuleName.js  |  35 +++-
 .../errorForConflictingExportEqualsValue.js   |  35 +++-
 .../reference/es6ExportEqualsInterop.js       |  40 +++-
 .../reference/es6ExportEqualsInterop.types    |   8 +-
 .../reference/es6ImportDefaultBindingAmd.js   |   4 +
 .../reference/es6ImportDefaultBindingDts.js   |   5 +-
 ...ultBindingFollowedWithNamedImport1InEs5.js |  15 +-
 ...ndingFollowedWithNamedImport1WithExport.js |  15 +-
 ...faultBindingFollowedWithNamedImportDts1.js |  15 +-
 ...ndingFollowedWithNamespaceBinding1InEs5.js |   5 +-
 ...FollowedWithNamespaceBinding1WithExport.js |   4 +
 ...tBindingFollowedWithNamespaceBindingDts.js |  35 +++-
 ...BindingFollowedWithNamespaceBindingDts1.js |   4 +
 ...indingFollowedWithNamespaceBindingInEs5.js |  35 +++-
 ...gFollowedWithNamespaceBindingWithExport.js |  35 +++-
 .../es6ImportDefaultBindingMergeErrors.js     |   5 +-
 .../es6ImportDefaultBindingWithExport.js      |   5 +-
 ...s6ImportEqualsExportModuleCommonJsError.js |  35 +++-
 .../reference/es6ImportNameSpaceImport.js     |  35 +++-
 .../reference/es6ImportNameSpaceImportAmd.js  |  34 +++
 .../reference/es6ImportNameSpaceImportDts.js  |  35 +++-
 .../es6ImportNameSpaceImportInEs5.js          |  35 +++-
 .../es6ImportNameSpaceImportWithExport.js     |  34 +++
 ...ImportNamedImportNoNamedExports.errors.txt |   8 +-
 ...Exports2(esmoduleinterop=false).errors.txt |   2 +
 .../expandoFunctionContextualTypesNoValue.js  |   5 +-
 .../reference/exportAndImport-es5-amd.js      |   4 +
 .../reference/exportAndImport-es5.js          |   5 +-
 .../exportAsNamespace1(module=amd).js         |  69 ++++++-
 .../exportAsNamespace1(module=commonjs).js    |  70 ++++++-
 .../exportAsNamespace1(module=umd).js         |  70 ++++++-
 .../reference/exportAsNamespace_augment.js    |  35 +++-
 .../exportAssignmentImportMergeNoCrash.js     |   5 +-
 .../reference/exportDefaultAbstractClass.js   |   5 +-
 .../reference/exportDefaultDuplicateCrash.js  |   5 +-
 .../exportDefaultMarksIdentifierAsUsed.js     |   5 +-
 .../reference/exportDefaultProperty.js        |  11 +-
 .../reference/exportDefaultProperty2.js       |   5 +-
 .../exportDefaultQualifiedNameNoError.js      |   5 +-
 .../reference/exportDefaultStripsFreshness.js |  35 +++-
 .../reference/exportEqualsDefaultProperty.js  |   5 +-
 .../baselines/reference/exportNamespace11.js  |  35 +++-
 .../baselines/reference/exportNamespace12.js  |  35 +++-
 tests/baselines/reference/exportNamespace2.js |  35 +++-
 tests/baselines/reference/exportNamespace3.js |  35 +++-
 tests/baselines/reference/exportStar-amd.js   |  34 +++
 tests/baselines/reference/exportStar.js       |  35 +++-
 .../reference/exportStarFromEmptyModule.js    |  35 +++-
 .../reference/exportStarNotElided.js          |  24 ++-
 ...portTypeMergedWithExportStarAsNamespace.js |  35 +++-
 .../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 +-
 ...essionsForbiddenInParameterInitializers.js |  35 +++-
 .../reference/extendsUntypedModule.js         |   5 +-
 .../externalModuleImmutableBindings.js        |  35 +++-
 .../goToDefinitionImports.baseline.jsonc      |   4 +-
 .../reference/ignoredJsxAttributes.js         |  35 +++-
 .../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.js        |  43 +++-
 .../importCallExpressionAsyncES5CJS.js        |  43 +++-
 .../importCallExpressionAsyncES5UMD.js        |  43 +++-
 .../importCallExpressionAsyncES6AMD.js        |  43 +++-
 .../importCallExpressionAsyncES6CJS.js        |  43 +++-
 .../importCallExpressionAsyncES6UMD.js        |  43 +++-
 .../importCallExpressionCheckReturntype1.js   |  39 +++-
 .../importCallExpressionDeclarationEmit1.js   |  43 +++-
 .../reference/importCallExpressionES5AMD.js   |  45 +++-
 .../reference/importCallExpressionES5CJS.js   |  45 +++-
 .../reference/importCallExpressionES5UMD.js   |  45 +++-
 .../reference/importCallExpressionES6AMD.js   |  45 +++-
 .../reference/importCallExpressionES6CJS.js   |  45 +++-
 .../reference/importCallExpressionES6UMD.js   |  45 +++-
 .../importCallExpressionGrammarError.js       |  41 +++-
 .../reference/importCallExpressionInAMD1.js   |  41 +++-
 .../reference/importCallExpressionInAMD2.js   |  35 +++-
 .../reference/importCallExpressionInAMD3.js   |  35 +++-
 .../reference/importCallExpressionInAMD4.js   |  45 +++-
 .../reference/importCallExpressionInCJS1.js   |  41 +++-
 .../reference/importCallExpressionInCJS2.js   |  37 +++-
 .../reference/importCallExpressionInCJS3.js   |  35 +++-
 .../reference/importCallExpressionInCJS4.js   |  35 +++-
 .../reference/importCallExpressionInCJS5.js   |  45 +++-
 .../importCallExpressionInExportEqualsAMD.js  |  35 +++-
 ...mportCallExpressionInExportEqualsAMD.types |  12 +-
 .../importCallExpressionInExportEqualsCJS.js  |  35 +++-
 .../importCallExpressionInExportEqualsUMD.js  |  35 +++-
 ...mportCallExpressionInExportEqualsUMD.types |  12 +-
 .../importCallExpressionInScriptContext1.js   |  35 +++-
 .../importCallExpressionInScriptContext2.js   |  35 +++-
 .../reference/importCallExpressionInUMD1.js   |  41 +++-
 .../reference/importCallExpressionInUMD2.js   |  35 +++-
 .../reference/importCallExpressionInUMD3.js   |  35 +++-
 .../reference/importCallExpressionInUMD4.js   |  45 +++-
 .../reference/importCallExpressionInUMD5.js   |  35 +++-
 .../importCallExpressionNestedAMD.js          |  35 +++-
 .../importCallExpressionNestedAMD2.js         |  35 +++-
 .../importCallExpressionNestedCJS.js          |  35 +++-
 .../importCallExpressionNestedCJS2.js         |  35 +++-
 .../importCallExpressionNestedUMD.js          |  35 +++-
 .../importCallExpressionNestedUMD2.js         |  35 +++-
 ...portCallExpressionNoModuleKindSpecified.js |  39 +++-
 .../importCallExpressionReturnPromiseOfAny.js |  49 ++++-
 ...llExpressionSpecifierNotStringTypeError.js |  43 +++-
 .../importCallExpressionWithTypeArgument.js   |  37 +++-
 .../importDeferNamespace(module=commonjs).js  |  35 +++-
 tests/baselines/reference/importEquals3.js    |  35 +++-
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 ...moduleinterop=false,module=amd).errors.txt |   2 +
 ...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 |   2 +
 .../importNonExportedMember10.errors.txt      |   2 +
 .../importNonExportedMember4.errors.txt       |   2 +
 .../importNonExportedMember6.errors.txt       |   2 +
 .../importNonExportedMember8.errors.txt       |   2 +
 .../reference/importNotElidedWhenNotFound.js  |  11 +-
 .../reference/importWithTrailingSlash.js      |  14 +-
 .../reference/importsImplicitlyReadonly.js    |  35 +++-
 .../inferredIndexerOnNamespaceImport.js       |  35 +++-
 .../reference/inlineJsxFactoryDeclarations.js |  40 +++-
 .../inlineJsxFactoryDeclarationsLocalTypes.js |  35 +++-
 ...inlineJsxFactoryLocalTypeGlobalFallback.js |   5 +-
 .../inlineJsxFactoryWithFragmentIsError.js    |  35 +++-
 ...nvalidSyntaxNamespaceImportWithCommonjs.js |  35 +++-
 .../isolatedModulesExportDeclarationType.js   |   5 +-
 .../isolatedModulesImportExportElision.js     |  35 +++-
 .../reference/isolatedModulesReExportType.js  |  35 +++-
 .../reference/jsDeclarationsDefault.js        |   5 +-
 .../reference/jsDeclarationsExportForms.js    | 105 +++++++++-
 .../reference/jsDeclarationsExportFormsErr.js |  35 +++-
 .../jsDeclarationsReexportAliases.js          |   7 +-
 .../baselines/reference/jsdocInTypeScript.js  |  35 +++-
 .../jsxCallElaborationCheckNoCrash1.js        |  35 +++-
 .../jsxCheckJsxNoTypeArgumentsAllowed.js      |  35 +++-
 .../jsxChildrenIndividualErrorElaborations.js |  35 +++-
 ...ldConfusableWithMultipleChildrenNoError.js |  35 +++-
 ...sxComplexSignatureHasApplicabilityError.js |  35 +++-
 tests/baselines/reference/jsxElementType.js   |  35 +++-
 .../reference/jsxElementTypeLiteral.js        |  35 +++-
 .../jsxElementTypeLiteralWithGeneric.js       |  35 +++-
 ...yExpressionNotCountedAsChild(jsx=react).js |  35 +++-
 .../jsxExcessPropsAndAssignability.js         |  35 +++-
 .../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 +-
 .../keyofModuleObjectHasCorrectKeys.js        |  35 +++-
 ...lesExportsSpecifierGenerationConditions.js |  35 +++-
 .../reference/mergedDeclarations7.js          |  35 +++-
 ...ntationDoesNamespaceEnumMergeOfReexport.js |  35 +++-
 .../reference/moduleMergeConstructor.js       |  34 +++
 .../moduleNoneDynamicImport(target=es2015).js |  35 +++-
 ...odule=commonjs,moduleresolution=node16).js |  35 +++-
 ...ule=commonjs,moduleresolution=nodenext).js |  35 +++-
 tests/baselines/reference/multiline.js        |  35 +++-
 .../reference/multipleDefaultExports01.js     |   5 +-
 .../reference/multipleDefaultExports02.js     |   5 +-
 .../reference/namespaceMemberAccess.js        |  35 +++-
 tests/baselines/reference/narrowedImports.js  |  37 +++-
 .../reference/newAbstractInstance2.js         |   5 +-
 .../reference/noCrashOnImportShadowing.js     |  70 ++++++-
 .../reference/nodeColonModuleResolution.js    |  35 +++-
 .../reference/nodeColonModuleResolution2.js   |  35 +++-
 .../reference/outFilerootDirModuleNamesAmd.js |  40 +++-
 .../amd/main.js                               |  34 +++
 .../node/main.js                              |  35 +++-
 .../amd/main.js                               |  34 +++
 .../node/main.js                              |  35 +++-
 .../emitDecoratorMetadataSystemJS/amd/main.js |  34 +++
 .../node/main.js                              |  35 +++-
 .../amd/main.js                               |  34 +++
 .../node/main.js                              |  35 +++-
 .../amd/main.js                               |  34 +++
 .../node/main.js                              |  35 +++-
 .../amd/importHigher/root.js                  |  34 +++
 .../node/importHigher/root.js                 |  35 +++-
 .../amd/maxDepthExceeded/built/root.js        |  34 +++
 .../node/maxDepthExceeded/built/root.js       |  35 +++-
 .../amd/maxDepthIncreased/root.js             |  35 ++++
 .../node/maxDepthIncreased/root.js            |  37 +++-
 .../reference/propTypeValidatorInference.js   |  35 +++-
 .../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 +-
 .../reference/reexportMissingDefault.js       |   5 +-
 .../reference/reexportMissingDefault2.js      |   5 +-
 .../reference/reexportMissingDefault3.js      |   5 +-
 .../reference/reexportMissingDefault4.js      |   5 +-
 .../reference/reexportMissingDefault6.js      |   5 +-
 .../requireAsFunctionInExternalModule.js      |  35 +++-
 ...PredicateIsInstantiateInContextOfTarget.js |  35 +++-
 .../redirect-previous-duplicate-packages.js   |   3 +-
 ...eFileByPath-previous-duplicate-packages.js |   3 +-
 .../selfReferentialDefaultNoStackOverflow.js  |   5 +-
 .../spellingSuggestionJSXAttribute.js         |  35 +++-
 ...adExpressionContextualTypeWithNamespace.js |  35 +++-
 .../reference/stackDepthLimitCastingType.js   |  35 +++-
 ...iesNoDirectLinkGeneratesNonrelativeName.js |  35 +++-
 ...ectLinkOptionalGeneratesNonrelativeName.js |  35 +++-
 ...oDirectLinkPeerGeneratesNonrelativeName.js |  35 +++-
 ...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 +++-
 ...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 +++-
 ...-dts-generation-errors-with-incremental.js |   4 +
 .../outFile/reports-dts-generation-errors.js  |   4 +
 ...-transitive-module-with-isolatedModules.js |  40 +++-
 .../inferred-type-from-transitive-module.js   |  40 +++-
 ...hange-in-signature-with-isolatedModules.js |  49 ++++-
 .../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 +++++++++++++----
 .../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 |   2 +-
 .../reference/tsc/commandLine/help-all.js     |   4 +-
 .../reference/tsc/commandLine/help.js         |   2 +-
 ...-when-host-can't-provide-terminal-width.js |   2 +-
 ...tatus.DiagnosticsPresent_OutputsSkipped.js |   2 +-
 ...-dts-generation-errors-with-incremental.js |   4 +
 .../outFile/reports-dts-generation-errors.js  |   4 +
 ...in-another-file-through-indirect-import.js |   5 +-
 .../generates-typerefs-correctly.js           |  74 ++++++-
 ...editing-module-augmentation-incremental.js |   5 +-
 .../editing-module-augmentation-watch.js      |   5 +-
 .../late-discovered-dependency-symlink.js     |  70 ++++++-
 ...hould-remove-the-module-not-found-error.js |  35 +++-
 ...tore-the-states-for-configured-projects.js |  35 +++-
 ...estore-the-states-for-inferred-projects.js |  35 +++-
 .../on-sample-project.js                      | 193 ++++++++++++++++--
 ...n-declarationMap-changes-for-dependency.js |  39 +++-
 ...-prefers-declaration-file-over-document.js |   5 +-
 .../tsconfigMapOptionsAreCaseInsensitive.js   |   4 +
 .../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 +++-
 .../reference/tsxElementResolution19.js       |  35 +++-
 .../reference/tsxExternalModuleEmit1.js       |  70 ++++++-
 .../reference/tsxExternalModuleEmit2.js       |   5 +-
 .../reference/tsxFragmentChildrenCheck.js     |  35 +++-
 .../reference/tsxNoTypeAnnotatedSFC.js        |  35 +++-
 .../reference/typeAndNamespaceExportMerge.js  |  35 +++-
 .../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 +-
 .../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 +-
 ...tionsESM(esmoduleinterop=false).errors.txt |   2 +
 ...ixNewImportExportEqualsESNextInteropOff.ts |   2 +-
 .../cases/fourslash/importTypeCompletions7.ts |   2 +-
 tests/cases/fourslash/javascriptModules24.ts  |   4 +-
 456 files changed, 13743 insertions(+), 1009 deletions(-)
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt
 create mode 100644 tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt
 create mode 100644 tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index f007f0844c1f9..98b437eb0a166 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -1150,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: Diagnostics.module_system_or_esModuleInterop,
+        defaultValueDescription: true,
     },
     {
         name: "esModuleInterop",
@@ -1161,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: false,
+        defaultValueDescription: true,
     },
     {
         name: "preserveSymlinks",
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 652d92257377c..c78ce26ab32da 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -4536,11 +4536,17 @@ 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");
+            }
             if (options.baseUrl !== undefined) {
                 createDeprecatedDiagnostic("baseUrl", /*value*/ undefined, /*useInstead*/ undefined, Diagnostics.Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information);
             }
-            if (options.moduleResolution === ModuleResolutionKind.Classic) {
-                createDeprecatedDiagnostic("moduleResolution", "classic");
+            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]);
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index dad5e78722bbf..51ea0e883feb8 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -9023,31 +9023,21 @@ const _computedOptions = createComputedCompilerOptions({
         },
     },
     esModuleInterop: {
-        dependencies: ["module", "target"],
+        dependencies: [],
         computeValue: (compilerOptions): boolean => {
             if (compilerOptions.esModuleInterop !== undefined) {
                 return compilerOptions.esModuleInterop;
             }
-            switch (_computedOptions.module.computeValue(compilerOptions)) {
-                case ModuleKind.Node16:
-                case ModuleKind.Node18:
-                case ModuleKind.Node20:
-                case ModuleKind.NodeNext:
-                case ModuleKind.Preserve:
-                    return true;
-            }
-            return false;
+            return true;
         },
     },
     allowSyntheticDefaultImports: {
-        dependencies: ["module", "target", "moduleResolution"],
+        dependencies: [],
         computeValue: (compilerOptions): boolean => {
             if (compilerOptions.allowSyntheticDefaultImports !== undefined) {
                 return compilerOptions.allowSyntheticDefaultImports;
             }
-            return _computedOptions.esModuleInterop.computeValue(compilerOptions)
-                || _computedOptions.module.computeValue(compilerOptions) === ModuleKind.System
-                || _computedOptions.moduleResolution.computeValue(compilerOptions) === ModuleResolutionKind.Bundler;
+            return true;
         },
     },
     resolvePackageJsonExports: {
diff --git a/tests/baselines/reference/APISample_jsdoc.js b/tests/baselines/reference/APISample_jsdoc.js
index a691da1fd6f64..94f63918fd74e 100644
--- a/tests/baselines/reference/APISample_jsdoc.js
+++ b/tests/baselines/reference/APISample_jsdoc.js
@@ -129,8 +129,41 @@ 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 = require("typescript");
+var ts = __importStar(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 7e380cf6a2603..608e688236906 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -79,9 +79,42 @@ 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 = require("typescript");
+var ts = __importStar(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 202d3245da91a..7006c54558c52 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -31,8 +31,41 @@ 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 = require("typescript");
+var ts = __importStar(require("typescript"));
 const source = "let x: string  = 'string'";
 let 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 95266a3475964..e8ba6c55444a4 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -126,8 +126,41 @@ 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 = require("typescript");
+var ts = __importStar(require("typescript"));
 function watch(rootFileNames, options) {
     const files = {};
     // initialize the list of files
diff --git a/tests/baselines/reference/allowImportClausesToMergeWithTypes.js b/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
index eda3e59f9e8dd..a51f4c1d100f7 100644
--- a/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
+++ b/tests/baselines/reference/allowImportClausesToMergeWithTypes.js
@@ -35,18 +35,24 @@ 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 = require("./b");
+var b_1 = __importDefault(require("./b"));
 exports.default = b_1.default;
 const 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 const x = { x: "" };
 a_1.default;
-var b_1 = require("./b");
+var b_1 = __importDefault(require("./b"));
 b_1.default;
 const y = x;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index eacd569b3d376..0b266c9009022 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -12,7 +12,10 @@ 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 = require("./b");
+var b_1 = __importDefault(require("./b"));
 exports.x = new b_1.default.Foo();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
index 31c369297e8e5..46ca261dcf94d 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports3.errors.txt
@@ -1,7 +1,9 @@
+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 6816718837a63..ecd5acabd4757 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -13,7 +13,10 @@ 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 = require("./b");
+var b_1 = __importDefault(require("./b"));
 exports.x = new b_1.default();
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
index ba6e3ae08b21b..b046f121d8110 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports6.errors.txt
@@ -1,7 +1,9 @@
+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 {
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
index a2e5847ee71e1..b65de50334d62 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports8.errors.txt
@@ -1,7 +1,9 @@
+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 f79bd76c192b9..5206974ee1db0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js
@@ -12,7 +12,10 @@ 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 = require("./b");
+var b_1 = __importDefault(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 0de3327533fdb..60a00583a8ba9 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -34,6 +34,9 @@ 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");
@@ -41,5 +44,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 = require("./file!text");
+var file_text_1 = __importDefault(require("./file!text"));
 (0, foobarbaz_1.foo)(file_text_1.default);
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 80c42be439857..f2ceb3f85ab1a 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/tests/baselines/reference/ambientShorthand.js
@@ -15,9 +15,42 @@ 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 = require("jquery");
-var baz = require("fs");
+var jquery_1 = __importStar(require("jquery"));
+var baz = __importStar(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 169d78faa8be2..fad16379ad344 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -42,8 +42,41 @@ 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 $ = require("./reExportAll");
+var $ = __importStar(require("./reExportAll"));
 // '$' is not callable, it is an object.
 (0, reExportX_1.x)($);
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index 99baf7967226e..d146f7b92246a 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -27,9 +27,47 @@ 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/arbitraryModuleNamespaceIdentifiers_module(module=amd).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
index 1a72c31df4c08..8461dbb329837 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=amd).js
@@ -33,6 +33,39 @@ 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 });
@@ -44,7 +77,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>"] = arbitraryModuleNamespaceIdentifiers_module_4;
+    exports["<Z>"] = __importStar(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 43f95451590dc..311a983aea48a 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js
@@ -34,6 +34,39 @@ 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";
@@ -46,7 +79,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>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
+exports["<Z>"] = __importStar(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).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
index 43f95451590dc..311a983aea48a 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=none).js
@@ -34,6 +34,39 @@ 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";
@@ -46,7 +79,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>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
+exports["<Z>"] = __importStar(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=umd).js b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
index a21466756821c..2f250d99bce84 100644
--- a/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
+++ b/tests/baselines/reference/arbitraryModuleNamespaceIdentifiers_module(module=umd).js
@@ -33,6 +33,39 @@ 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);
@@ -55,7 +88,7 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
     const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
     if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
         throw "should be someValue";
-    exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
+    exports["<Z>"] = __importStar(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 ba5b209818f6a..7061098dba010 100644
--- a/tests/baselines/reference/assertionFunctionWildcardImport1.js
+++ b/tests/baselines/reference/assertionFunctionWildcardImport1.js
@@ -33,14 +33,80 @@ 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 = require("../debug");
+var Debug = __importStar(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 = require("./_namespaces/ts");
+var ts = __importStar(require("./_namespaces/ts"));
 var ts_1 = require("./_namespaces/ts");
 ts.Debug.assert(true);
 ts_1.Debug.assert(true);
@@ -64,8 +130,41 @@ 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 = require("./_namespaces/ts");
+var ts = __importStar(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 4d1beeec12f3c..21014a3b2ce1f 100644
--- a/tests/baselines/reference/assertionFunctionWildcardImport2.js
+++ b/tests/baselines/reference/assertionFunctionWildcardImport2.js
@@ -31,8 +31,41 @@ 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 = require("./asserts");
+var asserts = __importStar(require("./asserts"));
 function test(obj) {
     asserts.isNonNullable(obj);
     obj.trim();
diff --git a/tests/baselines/reference/asyncImportNestedYield.js b/tests/baselines/reference/asyncImportNestedYield.js
index 5506cd557fef5..53c7500508651 100644
--- a/tests/baselines/reference/asyncImportNestedYield.js
+++ b/tests/baselines/reference/asyncImportNestedYield.js
@@ -6,6 +6,39 @@ 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 __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
@@ -21,6 +54,6 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
 };
 function foo() {
     return __asyncGenerator(this, arguments, function* foo_1() {
-        Promise.resolve("".concat((yield __await(Promise.resolve("".concat(yield yield __await("foo"))).then(function (s) { return require(s); }))).default)).then(function (s) { return require(s); });
+        Promise.resolve("".concat((yield __await(Promise.resolve("".concat(yield yield __await("foo"))).then(function (s) { return __importStar(require(s)); }))).default)).then(function (s) { return __importStar(require(s)); });
     });
 }
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 7d66ec2a9bd1b..64e00a4312e52 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -37,8 +37,41 @@ var x = require("./file1");
 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;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file1");
+var x = __importStar(require("./file1"));
 require("./file2");
 let a;
 let b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index 0309b39939eb4..2dfb3376fa452 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/tests/baselines/reference/augmentExportEquals3_1.js
@@ -34,9 +34,43 @@ 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);
     let a;
     let b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index 831854d0c8c77..915c036f843c5 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -38,8 +38,41 @@ var x = require("./file1");
 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;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file1");
+var x = __importStar(require("./file1"));
 require("./file2");
 let a;
 let b = x.b;
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index 31702dd044e4f..cdb6b86a996fb 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/tests/baselines/reference/augmentExportEquals4_1.js
@@ -34,9 +34,43 @@ 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);
     let a;
     let b = x.b;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
index 7c512800e3d27..161b62d7ebc9c 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 e
->          : ^^^^^^^^
+>"express" : typeof import("express")
+>          : ^^^^^^^^^^^^^^^^^^^^^^^^
 
     interface Request {
         id: number;
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index b37eed4206cc7..62021faebf2bb 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -47,8 +47,41 @@ var x = require("./file1");
 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;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file1");
+var x = __importStar(require("./file1"));
 require("./file2");
 let a;
 let b = a.a;
diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
index 1d8d7be621a32..67e1a8200cf54 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 : () => void
->    : ^^^^^^    
+>lib : { default: () => void; }
+>    : ^^^^^^^^^^^^^^^^^    ^^^
 
 declare module "lib" {
 >"lib" : typeof import("lib")
diff --git a/tests/baselines/reference/chained2.js b/tests/baselines/reference/chained2.js
index 7882a41e9a68a..048915e190cd6 100644
--- a/tests/baselines/reference/chained2.js
+++ b/tests/baselines/reference/chained2.js
@@ -31,14 +31,50 @@ class 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.default = void 0;
-var types = require("./b");
+var types = __importStar(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 = require("./c");
+var c_1 = __importDefault(require("./c"));
 new c_1.default.A();
 new c_1.default.B();
 const a = {};
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
index 0957401f14420..4ba0cb44b7a7e 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment1.js
@@ -30,6 +30,9 @@ 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
index 6323827fd2d67..309fb75ad8700 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment2.js
@@ -28,6 +28,9 @@ 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 = require("./b");
+var b_1 = __importDefault(require("./b"));
 b_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
index e4127cf9baebd..ca90e550ba9ee 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment3.js
@@ -33,6 +33,9 @@ const 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
index d3cfa97b031ce..0934b84307c40 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment5.js
@@ -30,6 +30,9 @@ 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
index 5fb34e2a5ef8f..592d06b04074d 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment6.js
@@ -30,6 +30,9 @@ 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
diff --git a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
index 40098255645c7..28cc1ca0b91dc 100644
--- a/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
+++ b/tests/baselines/reference/checkJsdocTypeTagOnExportAssignment7.js
@@ -33,6 +33,9 @@ const 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
diff --git a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
index 943ab68fcdf49..ecf82d904f65a 100644
--- a/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
+++ b/tests/baselines/reference/checkJsxGenericTagHasCorrectInferences.js
@@ -17,8 +17,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 let a = <GenericComponent initialValues={{ x: "y" }} nextValues={a => a}/>; // No error
 let b = <GenericComponent initialValues={12} nextValues={a => a}/>; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint)
 let c = <GenericComponent initialValues={{ x: "y" }} nextValues={a => ({ x: a.x })}/>; // No Error
diff --git a/tests/baselines/reference/checkJsxNotSetError.js b/tests/baselines/reference/checkJsxNotSetError.js
index 2f131a66ffb4b..fd63bdaf47178 100644
--- a/tests/baselines/reference/checkJsxNotSetError.js
+++ b/tests/baselines/reference/checkJsxNotSetError.js
@@ -17,6 +17,9 @@ const Foo = () => (<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 = require("/foo");
+var foo_1 = __importDefault(require("/foo"));
 const a = <foo_1.default />;
diff --git a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
index ceeffa33e44fb..c2d55c6226a82 100644
--- a/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
+++ b/tests/baselines/reference/checkJsxSubtleSkipContextSensitiveBug.js
@@ -28,6 +28,39 @@ const loader = <AsyncLoader
 
 //// [checkJsxSubtleSkipContextSensitiveBug.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) {
@@ -39,7 +72,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = require("react");
+var React = __importStar(require("react"));
 class AsyncLoader extends React.Component {
     render() { return null; }
 }
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 774b13aa29a76..0c16b16a784bb 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,7 +4,6 @@
         "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 8aa589286d383..76640f8c61e97 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,7 +2,6 @@
     "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 84e7539a3910a..dc2bf56f82562 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,7 +1,6 @@
 {
     "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 f52fceec5a166..068781086304f 100644
--- a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js
+++ b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace1.js
@@ -31,8 +31,41 @@ 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 = require("lodash/pick");
+var pick = __importStar(require("lodash/pick"));
 const pick = () => (0, exports.pick)();
 exports.pick = pick;
diff --git a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
index a77c69099c2b1..c1ff9f4b48624 100644
--- a/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
+++ b/tests/baselines/reference/conflictingDeclarationsImportFromNamespace2.js
@@ -31,8 +31,41 @@ 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 = require("lodash/pick");
+var pick = __importStar(require("lodash/pick"));
 const pick = () => (0, exports.pick)();
 exports.pick = pick;
diff --git a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
index cdec1c13c760a..7fd7a2c89d718 100644
--- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
+++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js
@@ -32,8 +32,41 @@ 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 = require("./foo");
+var Foo = __importStar(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 d5b6b117a7965..9cb4eb92575a0 100644
--- a/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js
+++ b/tests/baselines/reference/constEnumNamespaceReferenceCausesNoImport2.js
@@ -37,7 +37,40 @@ var ConstEnumOnlyModule;
 })(ConstEnumOnlyModule || (exports.ConstEnumOnlyModule = ConstEnumOnlyModule = {}));
 //// [reexport.js]
 "use strict";
-var Foo = require("./foo");
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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"));
 module.exports = Foo.ConstEnumOnlyModule;
 //// [index.js]
 "use strict";
diff --git a/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js b/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
index 9c9ea9e072b5f..5ce9b92ae95db 100644
--- a/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
+++ b/tests/baselines/reference/declarationEmitAnyComputedPropertyInClass.js
@@ -13,9 +13,12 @@ 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 = require("abcdefgh");
+var abcdefgh_1 = __importDefault(require("abcdefgh"));
 class C {
     [abcdefgh_1.default.someKey]() { }
     ;
diff --git a/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js b/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
index cb50f249caa77..c47203603211d 100644
--- a/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
+++ b/tests/baselines/reference/declarationEmitComputedNameConstEnumAlias.js
@@ -24,8 +24,11 @@ var EnumExample;
 exports.default = EnumExample;
 //// [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 EnumExample_1 = require("./EnumExample");
+var EnumExample_1 = __importDefault(require("./EnumExample"));
 exports.default = {
     [EnumExample_1.default.TEST]: {},
 };
diff --git a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
index ebfbf7c90f63f..9a7c5d3e106ca 100644
--- a/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
+++ b/tests/baselines/reference/declarationEmitExportAliasVisibiilityMarking.js
@@ -23,9 +23,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (suit, rank) => ({ suit, 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;
-let lazyCard = () => Promise.resolve().then(function () { return require('./Card'); }).then(a => a.default);
+let lazyCard = () => Promise.resolve().then(function () { return __importStar(require('./Card')); }).then(a => a.default);
 exports.lazyCard = lazyCard;
 
 
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends6.js b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
index 0efc0c2c5f941..da0f1e9034562 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends6.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends6.js
@@ -21,8 +21,41 @@ class Foo {
 exports.Foo = 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 });
-var A = require("./a");
+var A = __importStar(require("./a"));
 const { Foo } = A;
 class default_1 extends Foo {
 }
diff --git a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
index f3113fd34b3d9..553b53761b26e 100644
--- a/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
+++ b/tests/baselines/reference/declarationEmitMappedTypeDistributivityPreservesConstraints.js
@@ -26,8 +26,11 @@ function fn(sliceIndex) {
 exports.default = { 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 = require("./types");
+var types_1 = __importDefault(require("./types"));
 exports.default = { test: types_1.default };
 
 
diff --git a/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js b/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
index b4971867e6f25..7a7bbb6153d03 100644
--- a/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
+++ b/tests/baselines/reference/declarationEmitMappedTypeTemplateTypeofSymbol.js
@@ -20,9 +20,42 @@ 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 = require("./a");
+var x = __importStar(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 ac4336bf89c3b..5847f5e532fbf 100644
--- a/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js
+++ b/tests/baselines/reference/declarationEmitObjectAssignedDefaultExport.js
@@ -42,9 +42,12 @@ 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 = require("styled-components");
+const styled_components_1 = __importDefault(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 c857ed57eb1cf..4bfa4deb362a5 100644
--- a/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js
+++ b/tests/baselines/reference/declarationEmitOfTypeofAliasedExport.js
@@ -18,8 +18,41 @@ class C {
 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 = require("./a");
+var a = __importStar(require("./a"));
 exports.default = a.D;
 
 
diff --git a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
index 55f09aed81371..8914f2112f845 100644
--- a/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
+++ b/tests/baselines/reference/declarationEmitRetainedAnnotationRetainsImportInOutput.js
@@ -11,9 +11,42 @@ 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 = require("whatever");
+var E = __importStar(require("whatever"));
 const run = (i) => E.something(i);
 exports.run = run;
 
diff --git a/tests/baselines/reference/declarationEmitTypeofDefaultExport.js b/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
index 3481d075e5c16..aa0c91077bb93 100644
--- a/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
+++ b/tests/baselines/reference/declarationEmitTypeofDefaultExport.js
@@ -17,8 +17,41 @@ 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 = require("./a");
+var a = __importStar(require("./a"));
 exports.default = a.default;
 
 
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
index ce4360a4e0348..060cd15236ebc 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName.js
@@ -25,9 +25,12 @@ exports.default = createExperiment({
 });
 //// [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.obj = void 0;
-var other_1 = require("./other");
+var other_1 = __importDefault(require("./other"));
 exports.obj = {
     [other_1.default.name]: 1,
 };
diff --git a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
index d75ebaaa5ac86..6701ba1b4788a 100644
--- a/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
+++ b/tests/baselines/reference/declarationEmitWithDefaultAsComputedName2.js
@@ -25,9 +25,42 @@ 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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.obj = void 0;
-var other2 = require("./other");
+var other2 = __importStar(require("./other"));
 exports.obj = {
     [other2.default.name]: 1
 };
diff --git a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
index 559a2cbf39d8b..4e8363d18e2bf 100644
--- a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
+++ b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=false).js
@@ -11,6 +11,9 @@ 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 = require("./data.json");
+var data_json_1 = __importDefault(require("./data.json"));
 let x = data_json_1.default;
diff --git a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
index 559a2cbf39d8b..4e8363d18e2bf 100644
--- a/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
+++ b/tests/baselines/reference/declarationFileForJsonImport(resolvejsonmodule=true).js
@@ -11,6 +11,9 @@ 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 = require("./data.json");
+var data_json_1 = __importDefault(require("./data.json"));
 let x = data_json_1.default;
diff --git a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
index 2aa0f4f5f2630..6e5467c0c3335 100644
--- a/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
+++ b/tests/baselines/reference/declarationsIndirectGeneratedAliasReference.js
@@ -20,13 +20,45 @@ 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 = require("mod");
+var ns = __importStar(require("mod"));
 const Ctor = ns.default;
 exports.MyComp = Ctor.extends({ foo: "bar" });
 
 
 //// [index.d.ts]
-import * as ns from "mod";
-export declare const MyComp: import("mod/ctor").ExtendedCtor<ns.default>;
+export declare const MyComp: import("mod/ctor").ExtendedCtor<import("mod").default>;
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index e7e62b56482e2..79c7701593aa2 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -35,8 +35,11 @@ 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 = require("./service");
+var service_1 = __importDefault(require("./service"));
 let MyComponent = (() => {
     let MyComponent = class MyComponent {
         constructor(Service) {
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 4f6a9ddfc3b58..ddd1dd02ebe26 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -36,7 +36,7 @@ exports.db = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = require("./db"); // error no default export
+var db_1 = __importDefault(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 ec9680d51086e..ad2f14da79826 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -35,7 +35,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = require("./db");
+var db_1 = __importDefault(require("./db"));
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index b1008eb900f98..1b358dad9ab89 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -35,7 +35,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = require("./db");
+var db_1 = __importDefault(require("./db"));
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 957bd7aa18dbf..4105311cc1a5b 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -35,7 +35,7 @@ exports.default = db;
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MyClass = void 0;
-var db_1 = require("./db");
+var db_1 = __importDefault(require("./db"));
 function someDecorator(target) {
     return target;
 }
diff --git a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
index 46a44eed04c22..68d99866a3cee 100644
--- a/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
+++ b/tests/baselines/reference/defaultDeclarationEmitShadowedNamedCorrectly.js
@@ -23,10 +23,43 @@ 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 = require("./this");
+var me = __importStar(require("./this"));
 function make(x) {
     return null;
 }
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index 950c114113602..33b6d262d666a 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -37,6 +37,9 @@ 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);
@@ -48,7 +51,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    const a_1 = require("./a");
+    const a_1 = __importDefault(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 8aa41a6b52af0..64c5f6d98b6a6 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -28,8 +28,11 @@ 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 = require("./a");
+const a_1 = __importDefault(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 7063441df4a3f..521b6e010afd5 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -42,8 +42,11 @@ 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 = require("m1");
+var m1_1 = __importDefault(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 a3846dde5eae7..9f78a924bc260 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -32,8 +32,11 @@ class Decl {
 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 = require("m1");
+var m1_1 = __importDefault(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 b80935f096001..ec0e2a2145a92 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -32,8 +32,11 @@ class Decl {
 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 = require("m1");
+var m1_1 = __importDefault(require("m1"));
 (0, m1_1.default)();
 var x;
 var y;
diff --git a/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js b/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
index b125100774e3d..9e917b3716b45 100644
--- a/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
+++ b/tests/baselines/reference/duplicateObjectLiteralProperty_computedName3.js
@@ -46,8 +46,41 @@ 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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-var keys = require("./a");
+var keys = __importStar(require("./a"));
 const t1 = {
     [keys.n]: 1,
     [keys.n]: 1, // duplicate
diff --git a/tests/baselines/reference/duplicatePackage_referenceTypes.js b/tests/baselines/reference/duplicatePackage_referenceTypes.js
index 5623df05712c6..f3e13d7ead164 100644
--- a/tests/baselines/reference/duplicatePackage_referenceTypes.js
+++ b/tests/baselines/reference/duplicatePackage_referenceTypes.js
@@ -26,6 +26,39 @@ 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 = require("a");
+var a = __importStar(require("a"));
 let foo = a.foo;
diff --git a/tests/baselines/reference/duplicatePackage_subModule.js b/tests/baselines/reference/duplicatePackage_subModule.js
index 566e974f007db..7d248ee9f74b0 100644
--- a/tests/baselines/reference/duplicatePackage_subModule.js
+++ b/tests/baselines/reference/duplicatePackage_subModule.js
@@ -29,6 +29,39 @@ 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 = require("a");
+var a = __importStar(require("a"));
 const o = a.o;
diff --git a/tests/baselines/reference/dynamicImportEvaluateSpecifier.js b/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
index be247c57f0cba..d69f1eee00c48 100644
--- a/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
+++ b/tests/baselines/reference/dynamicImportEvaluateSpecifier.js
@@ -18,14 +18,47 @@ 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 => require(s));
-Promise.resolve(`${String(i++)}`).then(s => require(s));
+Promise.resolve(`${String(i++)}`).then(s => __importStar(require(s)));
+Promise.resolve(`${String(i++)}`).then(s => __importStar(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 => require(s));
+    const result = await Promise.resolve(`${await getPath()}`).then(s => __importStar(require(s)));
 };
diff --git a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
index 170719d33bb9a..7dc82fb5bd7e2 100644
--- a/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
+++ b/tests/baselines/reference/dynamicImportInDefaultExportExpression.js
@@ -9,9 +9,42 @@ 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 require('./foo2'); });
+        return Promise.resolve().then(function () { return __importStar(require('./foo2')); });
     }
 };
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.js b/tests/baselines/reference/dynamicImportTrailingComma.js
index 2566dd54f9f82..efdf980b392b8 100644
--- a/tests/baselines/reference/dynamicImportTrailingComma.js
+++ b/tests/baselines/reference/dynamicImportTrailingComma.js
@@ -5,5 +5,38 @@ 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;
+    };
+})();
 const path = './foo';
-Promise.resolve("".concat(path)).then(function (s) { return require(s); });
+Promise.resolve("".concat(path)).then(function (s) { return __importStar(require(s)); });
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
index 389e43baeb7ac..cd9a6dd92b87a 100644
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es2015.js
@@ -14,6 +14,39 @@ 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);
@@ -32,7 +65,7 @@ c.dynamic();
         }
         dynamic() {
             var _a;
-            return _a = this._path, __syncRequire ? Promise.resolve().then(() => require(_a)) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); });
+            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);
         }
     }
     const c = new C();
diff --git a/tests/baselines/reference/dynamicImportWithNestedThis_es5.js b/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
index 77ac071b03554..b71e55c20574b 100644
--- a/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
+++ b/tests/baselines/reference/dynamicImportWithNestedThis_es5.js
@@ -14,6 +14,39 @@ 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);
@@ -32,7 +65,7 @@ c.dynamic();
         }
         dynamic() {
             var _a;
-            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 _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);
         }
     }
     const c = new C();
diff --git a/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js b/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
index 1118bd2070c84..6cf0e64b38e93 100644
--- a/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
+++ b/tests/baselines/reference/emitDecoratorMetadata_isolatedModules(module=commonjs).js
@@ -53,17 +53,50 @@ class C3 {
 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 = require("./type1");
+var t1 = __importStar(require("./type1"));
 var class3_1 = require("./class3");
 let HelloWorld = (() => {
     class HelloWorld {
diff --git a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
index a539507bd5ef5..0442043886f1e 100644
--- a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
+++ b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
@@ -16,6 +16,39 @@
 
 
 //// [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) {
@@ -26,11 +59,44 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 };
 {
     require(__rewriteRelativeImportExtension("" + "./foo.ts"));
-    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
+    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s)));
     require("./foo.js");
-    Promise.resolve().then(() => require("./foo.js"));
+    Promise.resolve().then(() => __importStar(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) {
@@ -40,6 +106,6 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     return path;
 };
 {
-    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
-    Promise.resolve().then(() => require("./foo.js"));
+    Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s)));
+    Promise.resolve().then(() => __importStar(require("./foo.js")));
 }
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index 96c00b1b1d755..9de535262c2a7 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -7,7 +7,40 @@ class B extends A {
 
 //// [emptyModuleName.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 = require("");
+var A = __importStar(require(""));
 class B extends A {
 }
diff --git a/tests/baselines/reference/errorForConflictingExportEqualsValue.js b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
index 4b30409af4236..6d366b763e501 100644
--- a/tests/baselines/reference/errorForConflictingExportEqualsValue.js
+++ b/tests/baselines/reference/errorForConflictingExportEqualsValue.js
@@ -8,6 +8,39 @@ 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 require("./a"); });
+Promise.resolve().then(function () { return __importStar(require("./a")); });
 module.exports = exports.x;
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index b42bf42e1f4e5..e06913e5a4048 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -220,6 +220,28 @@ 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);
 };
@@ -244,15 +266,15 @@ z7.a;
 z8.a;
 z9.a;
 z0.a;
-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");
+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"));
 y1.a;
 y2.a;
 y3.a;
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types
index e7a53a89faec6..64d63a3922f05 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 z8
+>y8 : typeof y8
 >   : ^^^^^^^^^
 
 import * as y9 from "class";
@@ -203,7 +203,7 @@ import * as y9 from "class";
 >   : ^^^^^^^^^
 
 import * as y0 from "class-module";
->y0 : typeof z0
+>y0 : typeof y0
 >   : ^^^^^^^^^
 
 y1.a;
@@ -265,7 +265,7 @@ y7.a;
 y8.a;
 >y8.a : number
 >     : ^^^^^^
->y8 : typeof z8
+>y8 : typeof y8
 >   : ^^^^^^^^^
 >a : number
 >  : ^^^^^^
@@ -281,7 +281,7 @@ y9.a;
 y0.a;
 >y0.a : number
 >     : ^^^^^^
->y0 : typeof z0
+>y0 : typeof y0
 >   : ^^^^^^^^^
 >a : number
 >  : ^^^^^^
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 1f6b3c97c8fe3..ac5fbfe777f27 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -18,9 +18,13 @@ 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 e40cd5aa21b16..ec677f9494b27 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -18,9 +18,12 @@ class c {
 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 = require("./server");
+var server_1 = __importDefault(require("./server"));
 exports.x = new server_1.default();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index ef9ab7215bc85..05173fc4ac6bb 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -26,18 +26,21 @@ 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 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
+var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 4df23abf73416..59dbbcf9d1766 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -26,19 +26,22 @@ 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 = require("./server");
+var server_1 = __importDefault(require("./server"));
 exports.x1 = server_1.default;
-var server_2 = require("./server");
+var server_2 = __importDefault(require("./server"));
 exports.x1 = server_2.default;
-var server_3 = require("./server");
+var server_3 = __importDefault(require("./server"));
 exports.x1 = server_3.default;
-var server_4 = require("./server");
+var server_4 = __importDefault(require("./server"));
 exports.x1 = server_4.default;
-var server_5 = require("./server");
+var server_5 = __importDefault(require("./server"));
 exports.x1 = server_5.default;
-var server_6 = require("./server");
+var server_6 = __importDefault(require("./server"));
 exports.x1 = server_6.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index e1fe0a91412e7..5416d55ce188f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -26,19 +26,22 @@ class a {
 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 = require("./server");
+var server_1 = __importDefault(require("./server"));
 exports.x1 = new server_1.default();
-var server_2 = require("./server");
+var server_2 = __importDefault(require("./server"));
 exports.x2 = new server_2.default();
-var server_3 = require("./server");
+var server_3 = __importDefault(require("./server"));
 exports.x3 = new server_3.default();
-var server_4 = require("./server");
+var server_4 = __importDefault(require("./server"));
 exports.x4 = new server_4.default();
-var server_5 = require("./server");
+var server_5 = __importDefault(require("./server"));
 exports.x5 = new server_5.default();
-var server_6 = require("./server");
+var server_6 = __importDefault(require("./server"));
 exports.x6 = new server_6.default();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index 9183663850bcc..886110501474e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -15,8 +15,11 @@ 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 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
+var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"));
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index f8d5f05014422..816d4b5fb898d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -16,10 +16,14 @@ 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) {
     "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/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 76be7b852b1f6..e815554601f30 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -16,9 +16,42 @@ class a {
 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 = require("./server");
+var nameSpaceBinding = __importStar(require("./server"));
 exports.x = new nameSpaceBinding.a();
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 879270828de56..7861e152969e6 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -17,10 +17,14 @@ 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) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
+    server_1 = __importDefault(server_1);
     exports.x = new server_1.default();
 });
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 948c502babe98..595059eac3e18 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -14,8 +14,41 @@ 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 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
+var nameSpaceBinding = __importStar(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"));
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 51fe84eec1f70..3d4c46495939f 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -14,9 +14,42 @@ 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 = require("./server");
+var nameSpaceBinding = __importStar(require("./server"));
 exports.x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index 85f3d34cd6781..235056af327ef 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -22,7 +22,10 @@ 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 = require("./es6ImportDefaultBindingMergeErrors_0");
+var es6ImportDefaultBindingMergeErrors_0_1 = __importDefault(require("./es6ImportDefaultBindingMergeErrors_0"));
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 53bdb8233e90b..749e4ef07b717 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -16,9 +16,12 @@ 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 = require("./server");
+var server_1 = __importDefault(require("./server"));
 exports.x = server_1.default;
 
 
diff --git a/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js b/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
index 78695ae32d654..afb237984f957 100644
--- a/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
+++ b/tests/baselines/reference/es6ImportEqualsExportModuleCommonJsError.js
@@ -18,6 +18,39 @@ class a {
 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 = require("./a");
+var a = __importStar(require("./a"));
 a;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index ce72655687e2a..1f01c654c800d 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -16,8 +16,41 @@ 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 = require("./es6ImportNameSpaceImport_0");
+const nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImport_0"));
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index a9e632894a005..50ec2cdc2db7f 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -17,9 +17,43 @@ 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 10833da6f5048..0a89bf1cbb9eb 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -18,9 +18,42 @@ 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 = require("./server");
+var nameSpaceBinding = __importStar(require("./server"));
 exports.x = new nameSpaceBinding.c();
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index d3a53e2c8705f..b745b4042fa89 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -16,8 +16,41 @@ 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 = require("./es6ImportNameSpaceImportInEs5_0");
+var nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImportInEs5_0"));
 var x = nameSpaceBinding.a;
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index 79399f3111bd9..17b6a131ea274 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -17,10 +17,44 @@ 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/es6ImportNamedImportNoNamedExports.errors.txt b/tests/baselines/reference/es6ImportNamedImportNoNamedExports.errors.txt
index 480948746cd85..da972d070ea8b 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 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_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_0.ts (0 errors) ====
@@ -9,7 +9,7 @@ es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imp
 ==== es6ImportNamedImportNoNamedExports_1.ts (2 errors) ====
     import { a } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! 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.
+!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
     import { a as x } from "./es6ImportNamedImportNoNamedExports_0";
              ~
-!!! 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
+!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import.
\ No newline at end of file
diff --git a/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt b/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
index ad250e2728344..ff07793e48fe6 100644
--- a/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
+++ b/tests/baselines/reference/esmModuleExports2(esmoduleinterop=false).errors.txt
@@ -1,3 +1,4 @@
+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.
@@ -8,6 +9,7 @@
 /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/expandoFunctionContextualTypesNoValue.js b/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
index d94f75a8492d4..31ef35c312e34 100644
--- a/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
+++ b/tests/baselines/reference/expandoFunctionContextualTypesNoValue.js
@@ -11,9 +11,12 @@ 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 = require("blah");
+var blah_1 = __importDefault(require("blah"));
 function Foo() { }
 blah_1.default.bar = () => { };
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index 2166231cbeb21..b27a0a519d9ce 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -20,10 +20,14 @@ 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 e8276bb8d3f67..928ede233b00d 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -19,9 +19,12 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 function f2() {
     (0, m1_1.default)();
 }
diff --git a/tests/baselines/reference/exportAsNamespace1(module=amd).js b/tests/baselines/reference/exportAsNamespace1(module=amd).js
index 743ddb8c5462f..b14714c193667 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=amd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=amd).js
@@ -24,18 +24,85 @@ 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 = ns;
+    exports.ns = __importStar(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 9dbeb657616d2..1a80426816409 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=commonjs).js
@@ -23,15 +23,81 @@ 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 = require("./0");
+exports.ns = __importStar(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 = require("./1");
+var foo = __importStar(require("./1"));
 foo.ns.a;
 foo.ns.b;
 
diff --git a/tests/baselines/reference/exportAsNamespace1(module=umd).js b/tests/baselines/reference/exportAsNamespace1(module=umd).js
index d1218984d89f8..6b8a07a601090 100644
--- a/tests/baselines/reference/exportAsNamespace1(module=umd).js
+++ b/tests/baselines/reference/exportAsNamespace1(module=umd).js
@@ -32,6 +32,39 @@ 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);
@@ -44,11 +77,44 @@ foo.ns.b;
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ns = void 0;
-    exports.ns = require("./0");
+    exports.ns = __importStar(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);
@@ -60,7 +126,7 @@ foo.ns.b;
 })(function (require, exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var foo = require("./1");
+    var foo = __importStar(require("./1"));
     foo.ns.a;
     foo.ns.b;
 });
diff --git a/tests/baselines/reference/exportAsNamespace_augment.js b/tests/baselines/reference/exportAsNamespace_augment.js
index 9557e5cb0d403..be9787a943931 100644
--- a/tests/baselines/reference/exportAsNamespace_augment.js
+++ b/tests/baselines/reference/exportAsNamespace_augment.js
@@ -26,7 +26,40 @@ 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 = require("./a");
+var a2 = __importStar(require("./a"));
 a.x + a.y + a.z + a.conflict;
 a2.x + a2.y + a2.z + a2.conflict;
diff --git a/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js b/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
index 3a3239933f878..1c58ea2637496 100644
--- a/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
+++ b/tests/baselines/reference/exportAssignmentImportMergeNoCrash.js
@@ -19,7 +19,10 @@ 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 = require("./assignment");
+var assignment_1 = __importDefault(require("./assignment"));
 exports.Obj = void exports.Obj;
diff --git a/tests/baselines/reference/exportDefaultAbstractClass.js b/tests/baselines/reference/exportDefaultAbstractClass.js
index 954af2f12c56c..e02b2e9ccc9ba 100644
--- a/tests/baselines/reference/exportDefaultAbstractClass.js
+++ b/tests/baselines/reference/exportDefaultAbstractClass.js
@@ -23,8 +23,11 @@ class B extends A {
 new B().a.toExponential();
 //// [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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 class C extends a_1.default {
 }
 new C().a.toExponential();
diff --git a/tests/baselines/reference/exportDefaultDuplicateCrash.js b/tests/baselines/reference/exportDefaultDuplicateCrash.js
index 763e73582e48f..bb41acfacda07 100644
--- a/tests/baselines/reference/exportDefaultDuplicateCrash.js
+++ b/tests/baselines/reference/exportDefaultDuplicateCrash.js
@@ -11,11 +11,14 @@ 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 hi_1.default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(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 5772dcfa15f2f..6062f3a06e9f9 100644
--- a/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js
+++ b/tests/baselines/reference/exportDefaultMarksIdentifierAsUsed.js
@@ -15,6 +15,9 @@ 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 = require("./a");
+const a_1 = __importDefault(require("./a"));
 a_1.default.fn = function () { };
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 40f87dcca2fc7..1893f4dfe8115 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -59,14 +59,17 @@ 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 = require("foobar");
+var foobar_1 = __importDefault(require("foobar"));
 var X = foobar_1.default.X;
-var foobarx_1 = require("foobarx");
+var foobarx_1 = __importDefault(require("foobarx"));
 const x = X;
 const x2 = foobarx_1.default;
-var a_1 = require("./a");
+var a_1 = __importDefault(require("./a"));
 const b = new a_1.default(a_1.default.b);
-var b_1 = require("./b");
+var b_1 = __importDefault(require("./b"));
 b_1.default + 1;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index f276a8d056ef8..b1a55fdbb9ac7 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -23,6 +23,9 @@ class C {
 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 const x = { c: a_1.default };
diff --git a/tests/baselines/reference/exportDefaultQualifiedNameNoError.js b/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
index 52d498fd1a7a4..d58b90b8c4cfc 100644
--- a/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
+++ b/tests/baselines/reference/exportDefaultQualifiedNameNoError.js
@@ -20,6 +20,9 @@ let C = (() => {
 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 = require("./code");
+var code_1 = __importDefault(require("./code"));
 void code_1.default;
diff --git a/tests/baselines/reference/exportDefaultStripsFreshness.js b/tests/baselines/reference/exportDefaultStripsFreshness.js
index e6a1563297bfa..6dc48b99369ca 100644
--- a/tests/baselines/reference/exportDefaultStripsFreshness.js
+++ b/tests/baselines/reference/exportDefaultStripsFreshness.js
@@ -35,8 +35,41 @@ 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 = require("./items");
+var items_1 = __importStar(require("./items"));
 function nFoo(x) { }
 nFoo(items_1.q); // for comparison
 nFoo(items_1.default);
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 0efeedc4b80f6..a2c18f2792732 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -22,6 +22,9 @@ 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 = require("./exp");
+var exp_1 = __importDefault(require("./exp"));
 exp_1.default.toExponential(2);
diff --git a/tests/baselines/reference/exportNamespace11.js b/tests/baselines/reference/exportNamespace11.js
index b007926fd010e..b912b17b24c04 100644
--- a/tests/baselines/reference/exportNamespace11.js
+++ b/tests/baselines/reference/exportNamespace11.js
@@ -22,6 +22,39 @@ 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 = require("./intermediate");
+var intermediate = __importStar(require("./intermediate"));
 const ghost = new intermediate.Ghost();
diff --git a/tests/baselines/reference/exportNamespace12.js b/tests/baselines/reference/exportNamespace12.js
index a78bb4460622c..a370d8e73660b 100644
--- a/tests/baselines/reference/exportNamespace12.js
+++ b/tests/baselines/reference/exportNamespace12.js
@@ -22,7 +22,40 @@ 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 = require("./types");
+var types = __importStar(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 37d143c0eeabb..32c5f69d2f707 100644
--- a/tests/baselines/reference/exportNamespace2.js
+++ b/tests/baselines/reference/exportNamespace2.js
@@ -24,9 +24,42 @@ class A {
 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 = require("./a");
+exports.a = __importStar(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 71b4e5ecb0ad1..df293be709aad 100644
--- a/tests/baselines/reference/exportNamespace3.js
+++ b/tests/baselines/reference/exportNamespace3.js
@@ -26,9 +26,42 @@ 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 = require("./b");
+exports.a = __importStar(require("./b"));
 //// [d.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 5821f27ee4510..13ddf83e2a391 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -79,9 +79,43 @@ 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 5b33ce88b7787..3a16afcf3c530 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -72,8 +72,41 @@ __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 = require("./t4");
+var t4_1 = __importStar(require("./t4"));
 t4_1.default;
 t4_1.x;
 t4_1.y;
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 23273478cf949..99340a10d4788 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -56,8 +56,41 @@ class A {
 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 = require("./exportStarFromEmptyModule_module3");
+var X = __importStar(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 9e4af6752e29f..f73d8a3301ef3 100644
--- a/tests/baselines/reference/exportStarNotElided.js
+++ b/tests/baselines/reference/exportStarNotElided.js
@@ -34,14 +34,36 @@ 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 = require("./data1");
+exports.aliased = __importStar(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 a783e23a6d865..632536f4c2ab3 100644
--- a/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js
+++ b/tests/baselines/reference/exportTypeMergedWithExportStarAsNamespace.js
@@ -21,9 +21,42 @@ 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 = require("./Something");
+exports.Something = __importStar(require("./Something"));
 //// [usage.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index 07330f9ea1c70..ac0417666177f 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -45,10 +45,51 @@ 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 884469431ba8c..562d817aa39f7 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 a
+>c : typeof c
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index baa558ec02400..911828220e977 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -44,26 +44,62 @@ 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 = require("./t1");
+const t1_1 = __importDefault(require("./t1"));
 exports.b = t1_1.default;
 t1_1.default;
-const c = require("./t1");
+const c = __importStar(require("./t1"));
 exports.c = c;
 c.default;
-const t1_2 = require("./t1");
+const t1_2 = __importDefault(require("./t1"));
 Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } });
 t1_2.default;
-const t1_3 = require("./t1"), e2 = t1_3;
+const t1_3 = __importStar(require("./t1")), e2 = t1_3;
 exports.e1 = t1_3.default;
 exports.e2 = e2;
 t1_3.default;
 e2.default;
-const t1_4 = require("./t1");
+const t1_4 = __importDefault(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 103d301320c72..5d7d57856d777 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 a
+>c : typeof c
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 1cd118d871ec3..5d9b577c1714b 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -44,26 +44,62 @@ 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 = require("./t1");
+var t1_1 = __importDefault(require("./t1"));
 exports.b = t1_1.default;
 t1_1.default;
-var c = require("./t1");
+var c = __importStar(require("./t1"));
 exports.c = c;
 c.default;
-var t1_2 = require("./t1");
+var t1_2 = __importDefault(require("./t1"));
 Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } });
 t1_2.default;
-var t1_3 = require("./t1"), e2 = t1_3;
+var t1_3 = __importStar(require("./t1")), e2 = t1_3;
 exports.e1 = t1_3.default;
 exports.e2 = e2;
 t1_3.default;
 e2.default;
-var t1_4 = require("./t1");
+var t1_4 = __importDefault(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 8a357eecf542d..caa88a91937cb 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 a
+>c : typeof c
 >  : ^^^^^^^^
 
 c.default;
 >c.default : "hello"
 >          : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
@@ -46,8 +46,8 @@ d;
 import e1, * as e2 from "./t1";
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 
 e1;
 >e1 : "hello"
@@ -56,8 +56,8 @@ e1;
 e2.default;
 >e2.default : "hello"
 >           : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >default : "hello"
 >        : ^^^^^^^
 
@@ -82,14 +82,14 @@ export { a, b, c, d, e1, e2, f1, f2 };
 >  : ^^^^^^^^
 >b : "hello"
 >  : ^^^^^^^
->c : typeof a
+>c : typeof c
 >  : ^^^^^^^^
 >d : "hello"
 >  : ^^^^^^^
 >e1 : "hello"
 >   : ^^^^^^^
->e2 : typeof a
->   : ^^^^^^^^
+>e2 : typeof e2
+>   : ^^^^^^^^^
 >f1 : "hello"
 >   : ^^^^^^^
 >f2 : "hello"
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index 2fa1d3562f7c4..44352d9d4d106 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -25,8 +25,41 @@ 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 = require("./t1");
+var as = __importStar(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 e3928ffaf57de..b95c8e34b120c 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -24,6 +24,9 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 const { __, _, ___ } = m1_1.default;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 5c0fde3697492..c633e8a658f4d 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -22,6 +22,9 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 const { __esmodule, __proto__ } = m1_1.default;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index d161689a3d742..9efb77fe8f3e5 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -24,6 +24,9 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 const { ___, ___hello, _hi } = m1_1.default;
diff --git a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
index 35341633ea09e..802572711ee30 100644
--- a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
+++ b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.js
@@ -10,6 +10,39 @@ 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) {
@@ -23,7 +56,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.foo = foo;
 exports.foo2 = foo2;
 function foo(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ foo = yield Promise.resolve().then(function () { return require("./bar"); }) }) {
+    return __awaiter(this, arguments, void 0, function* ({ foo = yield Promise.resolve().then(function () { return __importStar(require("./bar")); }) }) {
     });
 }
 function* foo2({ foo = yield "a" }) {
diff --git a/tests/baselines/reference/extendsUntypedModule.js b/tests/baselines/reference/extendsUntypedModule.js
index 821bea4b9ed3b..abfe4a14d904f 100644
--- a/tests/baselines/reference/extendsUntypedModule.js
+++ b/tests/baselines/reference/extendsUntypedModule.js
@@ -14,9 +14,12 @@ export class A extends 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.A = void 0;
-var foo_1 = require("foo");
+var foo_1 = __importDefault(require("foo"));
 class A extends foo_1.default {
 }
 exports.A = A;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index c9243fe429db0..33841d30df4fb 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -57,9 +57,42 @@ 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 = require("./f1");
+var stuff = __importStar(require("./f1"));
 var n = 'baz';
 stuff.x = 0;
 stuff['x'] = 1;
diff --git a/tests/baselines/reference/goToDefinitionImports.baseline.jsonc b/tests/baselines/reference/goToDefinitionImports.baseline.jsonc
index d9c6422c06023..3d473ee006a53 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 b8cbf56fac195..cb182452e3d88 100644
--- a/tests/baselines/reference/ignoredJsxAttributes.js
+++ b/tests/baselines/reference/ignoredJsxAttributes.js
@@ -26,9 +26,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 let props = {
     foo: "",
     "data-yadda": 42, // Error
diff --git a/tests/baselines/reference/importAssertion1(module=commonjs).js b/tests/baselines/reference/importAssertion1(module=commonjs).js
index 233a0a293b6e5..a927686c3499c 100644
--- a/tests/baselines/reference/importAssertion1(module=commonjs).js
+++ b/tests/baselines/reference/importAssertion1(module=commonjs).js
@@ -43,10 +43,43 @@ 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 = require("./0");
+const foo = __importStar(require("./0"));
 _0_1.a;
 _0_1.b;
 foo.a;
@@ -61,15 +94,48 @@ _0_1.b;
 _0_2.a;
 _0_2.b;
 //// [3.js]
-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'));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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')));
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/importAssertion2(module=commonjs).js b/tests/baselines/reference/importAssertion2(module=commonjs).js
index c05cbe462912c..a3c51d1f8513f 100644
--- a/tests/baselines/reference/importAssertion2(module=commonjs).js
+++ b/tests/baselines/reference/importAssertion2(module=commonjs).js
@@ -34,16 +34,38 @@ 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 = require("./0");
+exports.ns = __importStar(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 efa8ccd637c10..3825f530c3e95 100644
--- a/tests/baselines/reference/importAttributes1(module=commonjs).js
+++ b/tests/baselines/reference/importAttributes1(module=commonjs).js
@@ -40,10 +40,43 @@ 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 = require("./0");
+const foo = __importStar(require("./0"));
 _0_1.a;
 _0_1.b;
 foo.a;
@@ -58,15 +91,48 @@ _0_1.b;
 _0_2.a;
 _0_2.b;
 //// [3.js]
-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'));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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')));
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/importAttributes2(module=commonjs).js b/tests/baselines/reference/importAttributes2(module=commonjs).js
index 98da1bd8edc06..0df07d2bbd057 100644
--- a/tests/baselines/reference/importAttributes2(module=commonjs).js
+++ b/tests/baselines/reference/importAttributes2(module=commonjs).js
@@ -34,16 +34,38 @@ 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 = require("./0");
+exports.ns = __importStar(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 bb0975afa8dc0..7aa4fb1cc94bd 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(ns, Decl(a.ts, 0, 0))
+>"./a" : Symbol("a", 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 f3cbc0e848f5b..fb948b5da1ab7 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 ns
->                                                                                  : ^^^^^^^^^
->import("./a", {        with: {            type: "not-json",        },    }) : Promise<typeof ns>
->                                                                            : ^^^^^^^^^^^^^^^^^^
+>await import("./a", {        with: {            type: "not-json",        },    }) : typeof import("a")
+>                                                                                  : ^^^^^^^^^^^^^^^^^^
+>import("./a", {        with: {            type: "not-json",        },    }) : Promise<typeof import("a")>
+>                                                                            : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >"./a" : "./a"
 >      : ^^^^^
 >{        with: {            type: "not-json",        },    } : { with: { type: "not-json"; }; }
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
index 4217b133229dd..9e4d05e9f37c2 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.js
@@ -31,6 +31,39 @@ 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) {
@@ -47,34 +80,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(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); }); // ONE
+            const req = yield new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); }).then(__importStar); // ONE
         });
     }
     class cl1 {
         m() {
             return __awaiter(this, void 0, void 0, function* () {
-                const req = yield new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); }); // TWO
+                const req = yield new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); }).then(__importStar); // TWO
             });
         }
     }
     exports.cl1 = cl1;
     exports.obj = {
         m: () => __awaiter(void 0, void 0, void 0, function* () {
-            const req = yield new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); }); // THREE
+            const req = yield new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); }).then(__importStar); // THREE
         })
     };
     class cl2 {
         constructor() {
             this.p = {
                 m: () => __awaiter(this, void 0, void 0, function* () {
-                    const req = yield new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); }); // FOUR
+                    const req = yield new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); }).then(__importStar); // FOUR
                 })
             };
         }
     }
     exports.cl2 = cl2;
     const l = () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); }); // FIVE
+        const req = yield new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); }).then(__importStar); // FIVE
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
index b44eca41e08fb..3aaed2da1c1e3 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.js
@@ -32,6 +32,39 @@ 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) {
@@ -46,33 +79,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(function () { return require('./test'); }); // ONE
+        const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // ONE
     });
 }
 class cl1 {
     m() {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = yield Promise.resolve().then(function () { return require('./test'); }); // TWO
+            const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // TWO
         });
     }
 }
 exports.cl1 = cl1;
 exports.obj = {
     m: () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield Promise.resolve().then(function () { return require('./test'); }); // THREE
+        const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // THREE
     })
 };
 class cl2 {
     constructor() {
         this.p = {
             m: () => __awaiter(this, void 0, void 0, function* () {
-                const req = yield Promise.resolve().then(function () { return require('./test'); }); // FOUR
+                const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // FOUR
             })
         };
     }
 }
 exports.cl2 = cl2;
 const l = () => __awaiter(void 0, void 0, void 0, function* () {
-    const req = yield Promise.resolve().then(function () { return require('./test'); }); // FIVE
+    const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // FIVE
 });
 exports.l = l;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
index 9af1a3298d49f..6dc648b33cfb4 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.js
@@ -31,6 +31,39 @@ 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) {
@@ -56,34 +89,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(function () { return require('./test'); }) : new Promise(function (resolve_1, reject_1) { require(['./test'], resolve_1, reject_1); }); // ONE
+            const req = 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
         });
     }
     class cl1 {
         m() {
             return __awaiter(this, void 0, void 0, function* () {
-                const req = yield __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_2, reject_2) { require(['./test'], resolve_2, reject_2); }); // TWO
+                const req = 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
             });
         }
     }
     exports.cl1 = cl1;
     exports.obj = {
         m: () => __awaiter(void 0, void 0, void 0, function* () {
-            const req = yield __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_3, reject_3) { require(['./test'], resolve_3, reject_3); }); // THREE
+            const req = 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
         })
     };
     class cl2 {
         constructor() {
             this.p = {
                 m: () => __awaiter(this, void 0, void 0, function* () {
-                    const req = yield __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_4, reject_4) { require(['./test'], resolve_4, reject_4); }); // FOUR
+                    const req = 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
                 })
             };
         }
     }
     exports.cl2 = cl2;
     const l = () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield __syncRequire ? Promise.resolve().then(function () { return require('./test'); }) : new Promise(function (resolve_5, reject_5) { require(['./test'], resolve_5, reject_5); }); // FIVE
+        const req = 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
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
index 21b14853ff444..34f8abf365b6e 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.js
@@ -31,6 +31,39 @@ 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) {
@@ -47,34 +80,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); }); // ONE
+            const req = yield new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }).then(__importStar); // 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); }); // TWO
+                const req = yield new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }).then(__importStar); // 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); }); // THREE
+            const req = yield new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }).then(__importStar); // 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); }); // FOUR
+                    const req = yield new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }).then(__importStar); // 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); }); // FIVE
+        const req = yield new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }).then(__importStar); // FIVE
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
index b425efa2287ef..6dfda64181593 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.js
@@ -32,6 +32,39 @@ 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) {
@@ -46,33 +79,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(() => require('./test')); // ONE
+        const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // ONE
     });
 }
 class cl1 {
     m() {
         return __awaiter(this, void 0, void 0, function* () {
-            const req = yield Promise.resolve().then(() => require('./test')); // TWO
+            const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // TWO
         });
     }
 }
 exports.cl1 = cl1;
 exports.obj = {
     m: () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield Promise.resolve().then(() => require('./test')); // THREE
+        const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // THREE
     })
 };
 class cl2 {
     constructor() {
         this.p = {
             m: () => __awaiter(this, void 0, void 0, function* () {
-                const req = yield Promise.resolve().then(() => require('./test')); // FOUR
+                const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FOUR
             })
         };
     }
 }
 exports.cl2 = cl2;
 const l = () => __awaiter(void 0, void 0, void 0, function* () {
-    const req = yield Promise.resolve().then(() => require('./test')); // FIVE
+    const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FIVE
 });
 exports.l = l;
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
index b87a1e62c758e..5dfb48d66b575 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.js
@@ -31,6 +31,39 @@ 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) {
@@ -56,34 +89,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(() => require('./test')) : new Promise((resolve_1, reject_1) => { require(['./test'], resolve_1, reject_1); }); // ONE
+            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
         });
     }
     class cl1 {
         m() {
             return __awaiter(this, void 0, void 0, function* () {
-                const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_2, reject_2) => { require(['./test'], resolve_2, reject_2); }); // TWO
+                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
             });
         }
     }
     exports.cl1 = cl1;
     exports.obj = {
         m: () => __awaiter(void 0, void 0, void 0, function* () {
-            const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_3, reject_3) => { require(['./test'], resolve_3, reject_3); }); // THREE
+            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
         })
     };
     class cl2 {
         constructor() {
             this.p = {
                 m: () => __awaiter(this, void 0, void 0, function* () {
-                    const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_4, reject_4) => { require(['./test'], resolve_4, reject_4); }); // FOUR
+                    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
                 })
             };
         }
     }
     exports.cl2 = cl2;
     const l = () => __awaiter(void 0, void 0, void 0, function* () {
-        const req = yield __syncRequire ? Promise.resolve().then(() => require('./test')) : new Promise((resolve_5, reject_5) => { require(['./test'], resolve_5, reject_5); }); // FIVE
+        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
     });
     exports.l = l;
 });
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.js b/tests/baselines/reference/importCallExpressionCheckReturntype1.js
index 9b1fd4e1fdc31..df380540201be 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.js
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.js
@@ -31,7 +31,40 @@ 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(() => require("./defaultPath"));
-let p2 = Promise.resolve().then(() => require("./defaultPath"));
-let p3 = Promise.resolve().then(() => require("./defaultPath"));
+let p1 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
+let p2 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
+let p3 = Promise.resolve().then(() => __importStar(require("./defaultPath")));
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit1.js b/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
index ba9d6efaa90f4..ff4c5a3080921 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit1.js
@@ -17,12 +17,45 @@ function returnDynamicLoad(path: string) {
 }
 
 //// [importCallExpressionDeclarationEmit1.js]
-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));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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)));
 function returnDynamicLoad(path) {
-    return Promise.resolve(`${path}`).then(s => require(s));
+    return Promise.resolve(`${path}`).then(s => __importStar(require(s)));
 }
 
 
diff --git a/tests/baselines/reference/importCallExpressionES5AMD.js b/tests/baselines/reference/importCallExpressionES5AMD.js
index 398f8e5bdbf0a..18603f0424126 100644
--- a/tests/baselines/reference/importCallExpressionES5AMD.js
+++ b/tests/baselines/reference/importCallExpressionES5AMD.js
@@ -36,27 +36,60 @@ 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); });
-    var p1 = new Promise(function (resolve_2, reject_2) { require(["./0"], resolve_2, reject_2); });
+    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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); });
+    exports.p2 = new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); }).then(__importStar);
     function foo() {
-        const p2 = new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); });
+        const p2 = new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); }).then(__importStar);
     }
     class C {
         method() {
-            const loadAsync = new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); });
+            const loadAsync = new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); }).then(__importStar);
         }
     }
     class D {
         method() {
-            const loadAsync = new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); });
+            const loadAsync = new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); }).then(__importStar);
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES5CJS.js b/tests/baselines/reference/importCallExpressionES5CJS.js
index 85660f562ca72..75750a895df2d 100644
--- a/tests/baselines/reference/importCallExpressionES5CJS.js
+++ b/tests/baselines/reference/importCallExpressionES5CJS.js
@@ -35,25 +35,58 @@ 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 require("./0"); });
-var p1 = Promise.resolve().then(function () { return require("./0"); });
+Promise.resolve().then(function () { return __importStar(require("./0")); });
+var p1 = Promise.resolve().then(function () { return __importStar(require("./0")); });
 p1.then(zero => {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(function () { return require("./0"); });
+exports.p2 = Promise.resolve().then(function () { return __importStar(require("./0")); });
 function foo() {
-    const p2 = Promise.resolve().then(function () { return require("./0"); });
+    const p2 = Promise.resolve().then(function () { return __importStar(require("./0")); });
 }
 class C {
     method() {
-        const loadAsync = Promise.resolve().then(function () { return require("./0"); });
+        const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
     }
 }
 class D {
     method() {
-        const loadAsync = Promise.resolve().then(function () { return require("./0"); });
+        const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
     }
 }
 exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES5UMD.js b/tests/baselines/reference/importCallExpressionES5UMD.js
index 3ce67cef7b777..13443ae388a9f 100644
--- a/tests/baselines/reference/importCallExpressionES5UMD.js
+++ b/tests/baselines/reference/importCallExpressionES5UMD.js
@@ -44,6 +44,39 @@ 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);
@@ -57,23 +90,23 @@ export class D {
     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 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); });
+    __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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_3, reject_3) { require(["./0"], resolve_3, reject_3); });
+    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);
     function foo() {
-        const p2 = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_4, reject_4) { require(["./0"], resolve_4, reject_4); });
+        const 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);
     }
     class C {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_5, reject_5) { require(["./0"], resolve_5, reject_5); });
+            const 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);
         }
     }
     class D {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(function () { return require("./0"); }) : new Promise(function (resolve_6, reject_6) { require(["./0"], resolve_6, reject_6); });
+            const 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);
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES6AMD.js b/tests/baselines/reference/importCallExpressionES6AMD.js
index 53ba3fcd37590..9771a8f9c3623 100644
--- a/tests/baselines/reference/importCallExpressionES6AMD.js
+++ b/tests/baselines/reference/importCallExpressionES6AMD.js
@@ -36,27 +36,60 @@ 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); });
-    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
+    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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
+    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
     function foo() {
-        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
     }
     class C {
         method() {
-            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
+            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
         }
     }
     class D {
         method() {
-            const loadAsync = new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); });
+            const loadAsync = new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); }).then(__importStar);
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES6CJS.js b/tests/baselines/reference/importCallExpressionES6CJS.js
index 89ed898d92754..7065853de2dc7 100644
--- a/tests/baselines/reference/importCallExpressionES6CJS.js
+++ b/tests/baselines/reference/importCallExpressionES6CJS.js
@@ -35,25 +35,58 @@ 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(() => require("./0"));
-var p1 = Promise.resolve().then(() => require("./0"));
+Promise.resolve().then(() => __importStar(require("./0")));
+var p1 = Promise.resolve().then(() => __importStar(require("./0")));
 p1.then(zero => {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(() => require("./0"));
+exports.p2 = Promise.resolve().then(() => __importStar(require("./0")));
 function foo() {
-    const p2 = Promise.resolve().then(() => require("./0"));
+    const p2 = Promise.resolve().then(() => __importStar(require("./0")));
 }
 class C {
     method() {
-        const loadAsync = Promise.resolve().then(() => require("./0"));
+        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
     }
 }
 class D {
     method() {
-        const loadAsync = Promise.resolve().then(() => require("./0"));
+        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
     }
 }
 exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionES6UMD.js b/tests/baselines/reference/importCallExpressionES6UMD.js
index 96c664e312de0..5b1e122ae8940 100644
--- a/tests/baselines/reference/importCallExpressionES6UMD.js
+++ b/tests/baselines/reference/importCallExpressionES6UMD.js
@@ -44,6 +44,39 @@ 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);
@@ -57,23 +90,23 @@ export class D {
     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(() => 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); });
+    __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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
+    exports.p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
     function foo() {
-        const p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+        const p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
     }
     class C {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
         }
     }
     class D {
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); });
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_6, reject_6) => { require(["./0"], resolve_6, reject_6); }).then(__importStar);
         }
     }
     exports.D = D;
diff --git a/tests/baselines/reference/importCallExpressionGrammarError.js b/tests/baselines/reference/importCallExpressionGrammarError.js
index 0952ed1c7fdb9..d05efe316a13f 100644
--- a/tests/baselines/reference/importCallExpressionGrammarError.js
+++ b/tests/baselines/reference/importCallExpressionGrammarError.js
@@ -12,8 +12,41 @@ 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 => require(s));
-var p1 = Promise.resolve(`${...a}`).then(s => require(s));
-const p2 = Promise.resolve().then(() => require());
-const p4 = Promise.resolve().then(() => require("pathToModule"));
+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")));
diff --git a/tests/baselines/reference/importCallExpressionInAMD1.js b/tests/baselines/reference/importCallExpressionInAMD1.js
index a6d5346b22bbe..7823bfb0fef33 100644
--- a/tests/baselines/reference/importCallExpressionInAMD1.js
+++ b/tests/baselines/reference/importCallExpressionInAMD1.js
@@ -24,17 +24,50 @@ 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); });
-    var p1 = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
+    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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
+    exports.p2 = new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
     function foo() {
-        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+        const p2 = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.js b/tests/baselines/reference/importCallExpressionInAMD2.js
index 3bc577db20937..a5e74e06ac078 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.js
+++ b/tests/baselines/reference/importCallExpressionInAMD2.js
@@ -27,6 +27,39 @@ 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
@@ -36,5 +69,5 @@ define(["require", "exports"], function (require, exports) {
             b.print();
         });
     }
-    foo(new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }));
+    foo(new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar));
 });
diff --git a/tests/baselines/reference/importCallExpressionInAMD3.js b/tests/baselines/reference/importCallExpressionInAMD3.js
index 895f29ff2d712..b258242c9796d 100644
--- a/tests/baselines/reference/importCallExpressionInAMD3.js
+++ b/tests/baselines/reference/importCallExpressionInAMD3.js
@@ -24,10 +24,43 @@ 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); })).B {
+        class C extends (await new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar)).B {
         }
         var c = new C();
         c.print();
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.js b/tests/baselines/reference/importCallExpressionInAMD4.js
index 4811e6ef26f0b..9105f7ec074be 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.js
+++ b/tests/baselines/reference/importCallExpressionInAMD4.js
@@ -60,36 +60,69 @@ 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); });
+            this.myModule = new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
         }
         method() {
-            const loadAsync = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
+            const loadAsync = new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
             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); });
+                let one = await new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }).then(__importStar);
                 console.log(one.backup());
             });
         }
     }
     class D {
         constructor() {
-            this.myModule = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+            this.myModule = new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
         }
         method() {
-            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
+            const loadAsync = new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
             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); });
+                let one = await new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }).then(__importStar);
                 console.log(one.backup());
             });
         }
diff --git a/tests/baselines/reference/importCallExpressionInCJS1.js b/tests/baselines/reference/importCallExpressionInCJS1.js
index 35be51f4c7d89..aa00938a45996 100644
--- a/tests/baselines/reference/importCallExpressionInCJS1.js
+++ b/tests/baselines/reference/importCallExpressionInCJS1.js
@@ -23,14 +23,47 @@ 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(() => require("./0"));
-var p1 = Promise.resolve().then(() => require("./0"));
+Promise.resolve().then(() => __importStar(require("./0")));
+var p1 = Promise.resolve().then(() => __importStar(require("./0")));
 p1.then(zero => {
     return zero.foo();
 });
-exports.p2 = Promise.resolve().then(() => require("./0"));
+exports.p2 = Promise.resolve().then(() => __importStar(require("./0")));
 function foo() {
-    const p2 = Promise.resolve().then(() => require("./0"));
+    const p2 = Promise.resolve().then(() => __importStar(require("./0")));
 }
diff --git a/tests/baselines/reference/importCallExpressionInCJS2.js b/tests/baselines/reference/importCallExpressionInCJS2.js
index b0efcae6197e2..0c6ab6027f689 100644
--- a/tests/baselines/reference/importCallExpressionInCJS2.js
+++ b/tests/baselines/reference/importCallExpressionInCJS2.js
@@ -29,12 +29,45 @@ 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(() => require("./1"));
+        j = await Promise.resolve().then(() => __importStar(require("./1")));
         return j.backup();
     }
     return j.foo();
 }
-compute(Promise.resolve().then(() => require("./0")));
+compute(Promise.resolve().then(() => __importStar(require("./0"))));
diff --git a/tests/baselines/reference/importCallExpressionInCJS3.js b/tests/baselines/reference/importCallExpressionInCJS3.js
index fde871e6e12c5..ea5abc43eaad2 100644
--- a/tests/baselines/reference/importCallExpressionInCJS3.js
+++ b/tests/baselines/reference/importCallExpressionInCJS3.js
@@ -25,6 +25,39 @@ 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 => {
@@ -32,4 +65,4 @@ function foo(x) {
         b.print();
     });
 }
-foo(Promise.resolve().then(() => require("./0")));
+foo(Promise.resolve().then(() => __importStar(require("./0"))));
diff --git a/tests/baselines/reference/importCallExpressionInCJS4.js b/tests/baselines/reference/importCallExpressionInCJS4.js
index 823fd6b4b95f6..f5c1f01cf053a 100644
--- a/tests/baselines/reference/importCallExpressionInCJS4.js
+++ b/tests/baselines/reference/importCallExpressionInCJS4.js
@@ -22,8 +22,41 @@ 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(() => require("./0"))).B {
+    class C extends (await Promise.resolve().then(() => __importStar(require("./0")))).B {
     }
     var c = new C();
     c.print();
diff --git a/tests/baselines/reference/importCallExpressionInCJS5.js b/tests/baselines/reference/importCallExpressionInCJS5.js
index 35ba9fe9a8dd8..6810bc810d08f 100644
--- a/tests/baselines/reference/importCallExpressionInCJS5.js
+++ b/tests/baselines/reference/importCallExpressionInCJS5.js
@@ -57,34 +57,67 @@ 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(() => require("./0"));
+        this.myModule = Promise.resolve().then(() => __importStar(require("./0")));
     }
     method() {
-        const loadAsync = Promise.resolve().then(() => require("./0"));
+        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
         this.myModule.then(Zero => {
             console.log(Zero.foo());
         }, async (err) => {
             console.log(err);
-            let one = await Promise.resolve().then(() => require("./1"));
+            let one = await Promise.resolve().then(() => __importStar(require("./1")));
             console.log(one.backup());
         });
     }
 }
 class D {
     constructor() {
-        this.myModule = Promise.resolve().then(() => require("./0"));
+        this.myModule = Promise.resolve().then(() => __importStar(require("./0")));
     }
     method() {
-        const loadAsync = Promise.resolve().then(() => require("./0"));
+        const loadAsync = Promise.resolve().then(() => __importStar(require("./0")));
         this.myModule.then(Zero => {
             console.log(Zero.foo());
         }, async (err) => {
             console.log(err);
-            let one = await Promise.resolve().then(() => require("./1"));
+            let one = await Promise.resolve().then(() => __importStar(require("./1")));
             console.log(one.backup());
         });
     }
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
index 1fcef2bde3941..b1e28d0ad9a86 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.js
@@ -14,9 +14,42 @@ 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); });
+        const something = await new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }).then(__importStar);
     };
 });
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsAMD.types
index fdeaef81b76d4..08fddebb2b401 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 : 42
->          : ^^
->await import("./something") : 42
->                            : ^^
->import("./something") : Promise<42>
->                      : ^^^^^^^^^^^
+>something : { default: 42; }
+>          : ^^^^^^^^^^^^^^^^
+>await import("./something") : { default: 42; }
+>                            : ^^^^^^^^^^^^^^^^
+>import("./something") : Promise<{ default: 42; }>
+>                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >"./something" : "./something"
 >              : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
index 72e3a0ec0af9b..7670be1a3603c 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsCJS.js
@@ -13,6 +13,39 @@ 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(() => require("./something"));
+    const something = await Promise.resolve().then(() => __importStar(require("./something")));
 };
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
index 5f70891b09e8e..54290d151c279 100644
--- a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
+++ b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.js
@@ -22,6 +22,39 @@ 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);
@@ -34,6 +67,6 @@ export = async function() {
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     return async function () {
-        const something = await (__syncRequire ? Promise.resolve().then(() => require("./something")) : new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }));
+        const something = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./something"))) : new Promise((resolve_1, reject_1) => { require(["./something"], resolve_1, reject_1); }).then(__importStar));
     };
 });
diff --git a/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types b/tests/baselines/reference/importCallExpressionInExportEqualsUMD.types
index ef1c8337be00d..e08523c30a49b 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 : 42
->          : ^^
->await import("./something") : 42
->                            : ^^
->import("./something") : Promise<42>
->                      : ^^^^^^^^^^^
+>something : { default: 42; }
+>          : ^^^^^^^^^^^^^^^^
+>await import("./something") : { default: 42; }
+>                            : ^^^^^^^^^^^^^^^^
+>import("./something") : Promise<{ default: 42; }>
+>                      : ^^^^^^^^^^^^^^^^^^^^^^^^^
 >"./something" : "./something"
 >              : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.js b/tests/baselines/reference/importCallExpressionInScriptContext1.js
index 170dbf5cfcfc2..4387900106dcd 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext1.js
+++ b/tests/baselines/reference/importCallExpressionInScriptContext1.js
@@ -13,5 +13,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
-var p1 = Promise.resolve().then(() => require("./0"));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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")));
 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 67b309ca0d96d..1bf061c07262a 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext2.js
+++ b/tests/baselines/reference/importCallExpressionInScriptContext2.js
@@ -15,5 +15,38 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var p1 = Promise.resolve().then(() => require("./0"));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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")));
 function arguments() { }
diff --git a/tests/baselines/reference/importCallExpressionInUMD1.js b/tests/baselines/reference/importCallExpressionInUMD1.js
index 569b7764c70ea..283861ebac3ed 100644
--- a/tests/baselines/reference/importCallExpressionInUMD1.js
+++ b/tests/baselines/reference/importCallExpressionInUMD1.js
@@ -32,6 +32,39 @@ 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);
@@ -45,13 +78,13 @@ function foo() {
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.p2 = void 0;
-    __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); });
+    __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);
     p1.then(zero => {
         return zero.foo();
     });
-    exports.p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); });
+    exports.p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_3, reject_3) => { require(["./0"], resolve_3, reject_3); }).then(__importStar);
     function foo() {
-        const p2 = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+        const p2 = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.js b/tests/baselines/reference/importCallExpressionInUMD2.js
index e804925921c84..d3d466fd54354 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.js
+++ b/tests/baselines/reference/importCallExpressionInUMD2.js
@@ -35,6 +35,39 @@ 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);
@@ -53,5 +86,5 @@ foo(import("./0"));
             b.print();
         });
     }
-    foo(__syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }));
+    foo(__syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar));
 });
diff --git a/tests/baselines/reference/importCallExpressionInUMD3.js b/tests/baselines/reference/importCallExpressionInUMD3.js
index eb34e6ca320a2..211bdd61fa1c5 100644
--- a/tests/baselines/reference/importCallExpressionInUMD3.js
+++ b/tests/baselines/reference/importCallExpressionInUMD3.js
@@ -32,6 +32,39 @@ 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);
@@ -44,7 +77,7 @@ foo();
     "use strict";
     var __syncRequire = typeof module === "object" && typeof module.exports === "object";
     async function foo() {
-        class C extends (await (__syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }))).B {
+        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 {
         }
         var c = new C();
         c.print();
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.js b/tests/baselines/reference/importCallExpressionInUMD4.js
index c166af4acc77d..7c019ff67e421 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.js
+++ b/tests/baselines/reference/importCallExpressionInUMD4.js
@@ -76,6 +76,39 @@ 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);
@@ -91,30 +124,30 @@ export class D {
     exports.D = void 0;
     class C {
         constructor() {
-            this.myModule = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); });
+            this.myModule = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_1, reject_1) => { require(["./0"], resolve_1, reject_1); }).then(__importStar);
         }
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); });
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_2, reject_2) => { require(["./0"], resolve_2, reject_2); }).then(__importStar);
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await (__syncRequire ? Promise.resolve().then(() => require("./1")) : new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }));
+                let one = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./1"))) : new Promise((resolve_3, reject_3) => { require(["./1"], resolve_3, reject_3); }).then(__importStar));
                 console.log(one.backup());
             });
         }
     }
     class D {
         constructor() {
-            this.myModule = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); });
+            this.myModule = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_4, reject_4) => { require(["./0"], resolve_4, reject_4); }).then(__importStar);
         }
         method() {
-            const loadAsync = __syncRequire ? Promise.resolve().then(() => require("./0")) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); });
+            const loadAsync = __syncRequire ? Promise.resolve().then(() => __importStar(require("./0"))) : new Promise((resolve_5, reject_5) => { require(["./0"], resolve_5, reject_5); }).then(__importStar);
             this.myModule.then(Zero => {
                 console.log(Zero.foo());
             }, async (err) => {
                 console.log(err);
-                let one = await (__syncRequire ? Promise.resolve().then(() => require("./1")) : new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }));
+                let one = await (__syncRequire ? Promise.resolve().then(() => __importStar(require("./1"))) : new Promise((resolve_6, reject_6) => { require(["./1"], resolve_6, reject_6); }).then(__importStar));
                 console.log(one.backup());
             });
         }
diff --git a/tests/baselines/reference/importCallExpressionInUMD5.js b/tests/baselines/reference/importCallExpressionInUMD5.js
index e070878f1f32f..0e7c4cb93f497 100644
--- a/tests/baselines/reference/importCallExpressionInUMD5.js
+++ b/tests/baselines/reference/importCallExpressionInUMD5.js
@@ -27,6 +27,39 @@ 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) {
@@ -52,7 +85,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(() => require(_a)) : new Promise((resolve_1, reject_1) => { require([_a], resolve_1, reject_1); }));
+            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));
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.js b/tests/baselines/reference/importCallExpressionNestedAMD.js
index 678c02a8e73c2..20dc7486a35db 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.js
@@ -15,6 +15,39 @@ 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) {
@@ -28,7 +61,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); })).default], resolve_1, reject_1); });
+            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);
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.js b/tests/baselines/reference/importCallExpressionNestedAMD2.js
index 08f7f1588b1c3..d144f78592590 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.js
@@ -15,6 +15,39 @@ 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) {
@@ -28,7 +61,7 @@ define(["require", "exports"], function (require, exports) {
     "use strict";
     function foo() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield new Promise(function (resolve_1, reject_1) { require([(yield new Promise(function (resolve_2, reject_2) { require(["./foo"], resolve_2, reject_2); })).default], resolve_1, reject_1); });
+            return yield new Promise(function (resolve_1, reject_1) { require([(yield new Promise(function (resolve_2, reject_2) { require(["./foo"], resolve_2, reject_2); }).then(__importStar)).default], resolve_1, reject_1); }).then(__importStar);
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS.js b/tests/baselines/reference/importCallExpressionNestedCJS.js
index 3101057a49788..39a60f3efe1c5 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS.js
@@ -13,6 +13,39 @@ 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) {
@@ -24,6 +57,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(() => require("./foo"))).default}`).then(s => require(s));
+        return yield Promise.resolve(`${(yield Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s)));
     });
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2.js b/tests/baselines/reference/importCallExpressionNestedCJS2.js
index 3a55410cac954..1efc7d3389fed 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS2.js
+++ b/tests/baselines/reference/importCallExpressionNestedCJS2.js
@@ -13,6 +13,39 @@ 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) {
@@ -24,6 +57,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("".concat((yield Promise.resolve().then(function () { return require("./foo"); })).default)).then(function (s) { return require(s); });
+        return yield Promise.resolve("".concat((yield Promise.resolve().then(function () { return __importStar(require("./foo")); })).default)).then(function (s) { return __importStar(require(s)); });
     });
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.js b/tests/baselines/reference/importCallExpressionNestedUMD.js
index 6d6c1b9b3e5cf..06ce3a055c1f4 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.js
@@ -23,6 +23,39 @@ 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) {
@@ -46,7 +79,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(() => 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); }));
+            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));
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.js b/tests/baselines/reference/importCallExpressionNestedUMD2.js
index 24771d140aa99..0a7388305784f 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.js
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.js
@@ -23,6 +23,39 @@ 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) {
@@ -46,7 +79,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(function () { return require("./foo"); }) : new Promise(function (resolve_1, reject_1) { require(["./foo"], resolve_1, reject_1); })).default, __syncRequire ? Promise.resolve().then(function () { return require(_a); }) : new Promise(function (resolve_2, reject_2) { require([_a], resolve_2, reject_2); }));
+            return yield (_a = (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)).default, __syncRequire ? Promise.resolve().then(function () { return __importStar(require(_a)); }) : new Promise(function (resolve_2, reject_2) { require([_a], resolve_2, reject_2); }).then(__importStar));
         });
     }
 });
diff --git a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
index 3c4378f8f071e..347adb36aa478 100644
--- a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
+++ b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.js
@@ -42,6 +42,39 @@ 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) {
@@ -53,15 +86,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 class C {
     constructor() {
-        this.myModule = Promise.resolve().then(function () { return require("./0"); });
+        this.myModule = Promise.resolve().then(function () { return __importStar(require("./0")); });
     }
     method() {
-        const loadAsync = Promise.resolve().then(function () { return require("./0"); });
+        const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); });
         this.myModule.then(Zero => {
             console.log(Zero.foo());
         }, (err) => __awaiter(this, void 0, void 0, function* () {
             console.log(err);
-            let one = yield Promise.resolve().then(function () { return require("./1"); });
+            let one = yield Promise.resolve().then(function () { return __importStar(require("./1")); });
             console.log(one.backup());
         }));
     }
diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
index 0bda2486b75cc..51bcdfc378162 100644
--- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
+++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js
@@ -42,21 +42,54 @@ 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 => 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));
+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)));
 p1.then(zero => {
     return zero.foo(); // ok, zero is any
 });
 let j;
-var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => require(s));
+var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => __importStar(require(s)));
 function* loadModule(directories) {
     for (const directory of directories) {
         const path = `${directory}\\moduleFile`;
-        Promise.resolve(`${yield path}`).then(s => require(s));
+        Promise.resolve(`${yield path}`).then(s => __importStar(require(s)));
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
index 45c94899231a1..bbf0929466469 100644
--- a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
+++ b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.js
@@ -16,12 +16,45 @@ 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 => require(s));
-var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s));
-const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s));
+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)));
 p1.then(zero => {
     return zero.foo(); // ok, zero is any
 });
-var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => require(s));
-var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => require(s));
+var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => __importStar(require(s)));
+var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => __importStar(require(s)));
diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.js b/tests/baselines/reference/importCallExpressionWithTypeArgument.js
index a2804c582521a..fe70a0b01f4e9 100644
--- a/tests/baselines/reference/importCallExpressionWithTypeArgument.js
+++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.js
@@ -15,5 +15,38 @@ exports.foo = foo;
 function foo() { return "foo"; }
 //// [1.js]
 "use strict";
-var p1 = Promise.resolve().then(() => require("./0")); // error
-var p2 = Promise.resolve().then(() => require("./0")); // error
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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
diff --git a/tests/baselines/reference/importDeferNamespace(module=commonjs).js b/tests/baselines/reference/importDeferNamespace(module=commonjs).js
index 181c471732260..95cd4ac60d5dd 100644
--- a/tests/baselines/reference/importDeferNamespace(module=commonjs).js
+++ b/tests/baselines/reference/importDeferNamespace(module=commonjs).js
@@ -19,6 +19,39 @@ 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 = require("./a.js");
+const aNs = __importStar(require("./a.js"));
 aNs.foo();
diff --git a/tests/baselines/reference/importEquals3.js b/tests/baselines/reference/importEquals3.js
index dc51b6e249058..f1ee4908e3f3d 100644
--- a/tests/baselines/reference/importEquals3.js
+++ b/tests/baselines/reference/importEquals3.js
@@ -37,7 +37,40 @@ const 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 = require("./b");
+var b = __importStar(require("./b"));
 var x = b.x;
 console.log(x);
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
index 58a5e5b8bdf6e..141210d0665cd 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
new file mode 100644
index 0000000000000..8eee618e8764c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,14 @@
+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 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types
@@ -19,4 +19,5 @@ 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
new file mode 100644
index 0000000000000..8eee618e8764c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,14 @@
+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 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types
@@ -19,4 +19,5 @@ 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
new file mode 100644
index 0000000000000..8eee618e8764c
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,14 @@
+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 4be4a9f98c18a..fe4d92dea23f2 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types
@@ -19,4 +19,5 @@ 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
index 5293f7ed56503..39c8e6d0d2a12 100644
--- a/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithExportStarAs(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
index 266be01be8043..9fdf9d0c057da 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
new file mode 100644
index 0000000000000..8506104b70999
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,17 @@
+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 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types
@@ -36,4 +36,5 @@ 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
new file mode 100644
index 0000000000000..8506104b70999
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,17 @@
+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 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types
@@ -36,4 +36,5 @@ 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
new file mode 100644
index 0000000000000..8506104b70999
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,17 @@
+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 87423d8b5e802..6159bcfe75d2e 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types
@@ -36,4 +36,5 @@ 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
index f64e9f067def7..fa3348a608424 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
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
index f8c1dfd1ec39f..6e988f05c114f 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
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
new file mode 100644
index 0000000000000..af7bff79a0635
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..af7bff79a0635
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..af7bff79a0635
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,10 @@
+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
index fad0b50808aed..852516e62df99 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.1(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
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
index eef61dd5e5f50..ee8cd804ecc33 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
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
new file mode 100644
index 0000000000000..588d25270f6e1
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..588d25270f6e1
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000000..588d25270f6e1
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,10 @@
+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
index 8d058056eeff8..eae445c8285d1 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.2(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
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
index a61550b1c96ad..8650f643f5fa6 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
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
new file mode 100644
index 0000000000000..04869bb6fcb8d
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..04869bb6fcb8d
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000000..04869bb6fcb8d
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,11 @@
+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
index 138103b44592d..d13aa2bb27c74 100644
--- a/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportOrExportDefaultNoTslib.3(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
index c51743ffe171a..01b868c786d50 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=amd).errors.txt
@@ -1,6 +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.
 error TS5107: Option '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 { }
diff --git a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
new file mode 100644
index 0000000000000..56569d9ad08ee
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).errors.txt
@@ -0,0 +1,15 @@
+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 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types
@@ -23,4 +23,5 @@ 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
new file mode 100644
index 0000000000000..56569d9ad08ee
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).errors.txt
@@ -0,0 +1,15 @@
+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 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types
@@ -23,4 +23,5 @@ 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
new file mode 100644
index 0000000000000..56569d9ad08ee
--- /dev/null
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).errors.txt
@@ -0,0 +1,15 @@
+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 3f33963009f95..2ce2f7c7c6271 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types
@@ -23,4 +23,5 @@ 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
index 102eafd56a8f3..09917c6b0ff74 100644
--- a/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
+++ b/tests/baselines/reference/importHelpersWithImportStarAs(esmoduleinterop=false,module=system).errors.txt
@@ -1,6 +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.
 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 { }
diff --git a/tests/baselines/reference/importNonExportedMember10.errors.txt b/tests/baselines/reference/importNonExportedMember10.errors.txt
index 66f586f133f72..f65e55bf9471e 100644
--- a/tests/baselines/reference/importNonExportedMember10.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember10.errors.txt
@@ -1,8 +1,10 @@
+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 d4294bc523496..121f087eb5301 100644
--- a/tests/baselines/reference/importNonExportedMember4.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember4.errors.txt
@@ -1,7 +1,9 @@
+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 07938b7690319..886d7ae138a61 100644
--- a/tests/baselines/reference/importNonExportedMember6.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember6.errors.txt
@@ -1,8 +1,10 @@
+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 6245d6dca6434..9113b7056e5f0 100644
--- a/tests/baselines/reference/importNonExportedMember8.errors.txt
+++ b/tests/baselines/reference/importNonExportedMember8.errors.txt
@@ -1,7 +1,9 @@
+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/importNotElidedWhenNotFound.js b/tests/baselines/reference/importNotElidedWhenNotFound.js
index 564dfd5489998..1c53ed64da376 100644
--- a/tests/baselines/reference/importNotElidedWhenNotFound.js
+++ b/tests/baselines/reference/importNotElidedWhenNotFound.js
@@ -21,16 +21,19 @@ class Q extends Z {
 
 //// [importNotElidedWhenNotFound.js]
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var file_1 = require("file");
-var other_file_1 = require("other_file");
+var file_1 = __importDefault(require("file"));
+var other_file_1 = __importDefault(require("other_file"));
 class Y extends other_file_1.default {
     constructor() {
         super(file_1.default);
     }
 }
-var file2_1 = require("file2");
-var file3_1 = require("file3");
+var file2_1 = __importDefault(require("file2"));
+var file3_1 = __importDefault(require("file3"));
 class Q extends other_file_1.default {
     constructor() {
         super(file2_1.default, file3_1.default);
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index c2b5ba82f0794..0f7a97ae5d8f1 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -29,15 +29,21 @@ 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 = require(".");
-var _2 = require("./");
+var _1 = __importDefault(require("."));
+var _2 = __importDefault(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 = require("..");
-var __2 = require("../");
+var __1 = __importDefault(require(".."));
+var __2 = __importDefault(require("../"));
 __1.default.a;
 __2.default.aIndex;
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index bd286c304c2cf..a1f41b101d1ab 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -29,9 +29,42 @@ 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 = require("./a");
+var a1 = __importStar(require("./a"));
 var a2 = require("./a");
 const a3 = a1;
 a_1.x = 1; // Error
diff --git a/tests/baselines/reference/inferredIndexerOnNamespaceImport.js b/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
index 9c3d21e687ff0..d0f9a65b998e7 100644
--- a/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
+++ b/tests/baselines/reference/inferredIndexerOnNamespaceImport.js
@@ -21,8 +21,41 @@ 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 = require("./foo");
+var foo = __importStar(require("./foo"));
 function f(map) {
     // ...
 }
diff --git a/tests/baselines/reference/inlineJsxFactoryDeclarations.js b/tests/baselines/reference/inlineJsxFactoryDeclarations.js
index 5502aab07c81a..5e51999ffd948 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarations.js
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarations.js
@@ -39,9 +39,42 @@ 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 = require("./renderer");
+var React = __importStar(require("./renderer"));
 React.createElement("h", null);
 //// [other.js]
 "use strict";
@@ -59,9 +92,12 @@ 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 = require("./renderer");
+var renderer_1 = __importDefault(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 f49f2027a4224..f355c128ce813 100644
--- a/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js
+++ b/tests/baselines/reference/inlineJsxFactoryDeclarationsLocalTypes.js
@@ -122,10 +122,43 @@ 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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @jsx dom */
 var renderer_1 = require("./renderer");
-var component_1 = require("./component");
+var component_1 = __importStar(require("./component"));
 let elem = component_1.default;
 elem = (0, renderer_1.dom)("h", null); // Expect assignability error here
 const DOMSFC = (props) => (0, renderer_1.dom)("p", null,
diff --git a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
index 155c0b1645f68..9d54c9a580c5b 100644
--- a/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
+++ b/tests/baselines/reference/inlineJsxFactoryLocalTypeGlobalFallback.js
@@ -53,9 +53,12 @@ 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 = require("./component");
+var component_1 = __importDefault(require("./component"));
 let 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 f68d91318c565..7e84df6d0165b 100644
--- a/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js
+++ b/tests/baselines/reference/inlineJsxFactoryWithFragmentIsError.js
@@ -21,9 +21,42 @@ 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 = require("./renderer");
+var React = __importStar(require("./renderer"));
 React.createElement(React.Fragment, null,
     React.createElement("h", null));
 //// [index.js]
diff --git a/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js b/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
index 14d1d01f9331f..819b6e1f7271a 100644
--- a/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
+++ b/tests/baselines/reference/invalidSyntaxNamespaceImportWithCommonjs.js
@@ -15,7 +15,40 @@ 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 });
-var from = require();
+var from = __importStar(require());
 from;
 "./0";
diff --git a/tests/baselines/reference/isolatedModulesExportDeclarationType.js b/tests/baselines/reference/isolatedModulesExportDeclarationType.js
index 5ce97f5224e7d..2779ab682863b 100644
--- a/tests/baselines/reference/isolatedModulesExportDeclarationType.js
+++ b/tests/baselines/reference/isolatedModulesExportDeclarationType.js
@@ -39,7 +39,10 @@ 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 = require("./doesntexist");
+var doesntexist_1 = __importDefault(require("./doesntexist"));
 exports.default = doesntexist_1.default;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index 0dd81c06bc140..5419b35966124 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -16,11 +16,44 @@ export var z = x;
 
 //// [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.z = exports.c1 = void 0;
 var module_1 = require("module");
 var module_2 = require("module");
-var ns = require("module");
+var ns = __importStar(require("module"));
 class C extends module_2.c2.C {
 }
 let x = new module_1.c();
diff --git a/tests/baselines/reference/isolatedModulesReExportType.js b/tests/baselines/reference/isolatedModulesReExportType.js
index bc444aeed8259..98a4e18ea1411 100644
--- a/tests/baselines/reference/isolatedModulesReExportType.js
+++ b/tests/baselines/reference/isolatedModulesReExportType.js
@@ -70,11 +70,44 @@ 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 = require("./exportT");
+var NS = __importStar(require("./exportT"));
 exports.NS = NS;
diff --git a/tests/baselines/reference/jsDeclarationsDefault.js b/tests/baselines/reference/jsDeclarationsDefault.js
index c7a443c1da3d7..2aab9c0759465 100644
--- a/tests/baselines/reference/jsDeclarationsDefault.js
+++ b/tests/baselines/reference/jsDeclarationsDefault.js
@@ -68,8 +68,11 @@ exports.Bar = Foo;
 exports.X = Foo;
 //// [index4.js]
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var index3_1 = require("./index3");
+var index3_1 = __importDefault(require("./index3"));
 class Bar extends index3_1.default {
     constructor() {
         super(...arguments);
diff --git a/tests/baselines/reference/jsDeclarationsExportForms.js b/tests/baselines/reference/jsDeclarationsExportForms.js
index 48a16f2a57733..5ce3bf1b69c35 100644
--- a/tests/baselines/reference/jsDeclarationsExportForms.js
+++ b/tests/baselines/reference/jsDeclarationsExportForms.js
@@ -115,20 +115,119 @@ 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 = require("./cls");
+var ns = __importStar(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 = require("./cls");
+var ns = __importStar(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 = require("./cls");
+var ns = __importStar(require("./cls"));
 exports.classContainer = ns;
 //// [cjs.js]
 const ns = require("./cls");
diff --git a/tests/baselines/reference/jsDeclarationsExportFormsErr.js b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
index 6262258affd9c..3d79cccc84a8f 100644
--- a/tests/baselines/reference/jsDeclarationsExportFormsErr.js
+++ b/tests/baselines/reference/jsDeclarationsExportFormsErr.js
@@ -34,8 +34,41 @@ 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 = require("./cls");
+var ns = __importStar(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/jsDeclarationsReexportAliases.js b/tests/baselines/reference/jsDeclarationsReexportAliases.js
index 9c1ab3e8e2cf9..03001e27036d4 100644
--- a/tests/baselines/reference/jsDeclarationsReexportAliases.js
+++ b/tests/baselines/reference/jsDeclarationsReexportAliases.js
@@ -19,12 +19,15 @@ class Foo {
 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 = require("./cls");
+var cls_1 = __importDefault(require("./cls"));
 exports.x = new cls_1.default();
 var cls_2 = require("./cls");
-Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return cls_2.default; } });
+Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return __importDefault(cls_2).default; } });
 
 
 //// [cls.d.ts]
diff --git a/tests/baselines/reference/jsdocInTypeScript.js b/tests/baselines/reference/jsdocInTypeScript.js
index 3012f377bbbef..a80f849f01de5 100644
--- a/tests/baselines/reference/jsdocInTypeScript.js
+++ b/tests/baselines/reference/jsdocInTypeScript.js
@@ -60,6 +60,39 @@ 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;
+    };
+})();
 class T {
 }
 x.prop;
@@ -91,4 +124,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 require(s); });
+var v = Promise.resolve("".concat(String())).then(function (s) { return __importStar(require(s)); });
diff --git a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
index 5f00f9a64f360..cb9d3b50d3428 100644
--- a/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
+++ b/tests/baselines/reference/jsxCallElaborationCheckNoCrash1.js
@@ -18,9 +18,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const Hoc = (TagElement) => {
     const Component = () => React.createElement(TagElement, null);
     return Component;
diff --git a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
index bff530622d34b..f7c2e191458b4 100644
--- a/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
+++ b/tests/baselines/reference/jsxCheckJsxNoTypeArgumentsAllowed.js
@@ -20,8 +20,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 let 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 025d4f68e4802..04bfed6345d2d 100644
--- a/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
+++ b/tests/baselines/reference/jsxChildrenIndividualErrorElaborations.js
@@ -80,12 +80,45 @@ 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 = require("react");
+var React = __importStar(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 161f6df646352..8b2bb9ced90d1 100644
--- a/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
+++ b/tests/baselines/reference/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js
@@ -29,9 +29,42 @@ export class App extends React.Component<{}> {
 //// [jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.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.App = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 function TabLayout(props) {
     return React.createElement("div", null);
 }
diff --git a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
index 3effe409d5852..faec2a18bc80f 100644
--- a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
+++ b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
@@ -624,9 +624,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 function createReactSingleSelect(WrappedComponent) {
     return (props) => {
         return (React.createElement(ReactSelectClass, __assign({}, props, { multi: false, autosize: false, value: props.value, onChange: (value) => {
diff --git a/tests/baselines/reference/jsxElementType.js b/tests/baselines/reference/jsxElementType.js
index e85da9bb1d2b7..7fc4970ead544 100644
--- a/tests/baselines/reference/jsxElementType.js
+++ b/tests/baselines/reference/jsxElementType.js
@@ -116,6 +116,39 @@ declare global {
 
 //// [jsxElementType.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) {
@@ -127,7 +160,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /// <reference path="react16.d.ts" />
-var React = require("react");
+var React = __importStar(require("react"));
 let Component;
 const RenderElement = ({ title }) => React.createElement("div", null, title);
 Component = RenderElement;
diff --git a/tests/baselines/reference/jsxElementTypeLiteral.js b/tests/baselines/reference/jsxElementTypeLiteral.js
index f66e5885cdfb1..eb2fcd2c4afd8 100644
--- a/tests/baselines/reference/jsxElementTypeLiteral.js
+++ b/tests/baselines/reference/jsxElementTypeLiteral.js
@@ -25,9 +25,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 // should be fine - `ElementType` accepts `div`
 let 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 90f33ec50f58c..f663a34bbd5cb 100644
--- a/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
+++ b/tests/baselines/reference/jsxElementTypeLiteralWithGeneric.js
@@ -26,9 +26,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 // should be fine - `ElementType` accepts `div`
 let 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 edc593502fe61..7ae91ba54b61f 100644
--- a/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
+++ b/tests/baselines/reference/jsxEmptyExpressionNotCountedAsChild(jsx=react).js
@@ -21,9 +21,42 @@ 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 = require("react");
+var React = __importStar(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 3b6c897cfa04c..e5aa2402de87b 100644
--- a/tests/baselines/reference/jsxExcessPropsAndAssignability.js
+++ b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
@@ -32,8 +32,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const myHoc = (ComposedComponent) => {
     const WrapperComponent = null;
     const props = null;
diff --git a/tests/baselines/reference/jsxHasLiteralType.js b/tests/baselines/reference/jsxHasLiteralType.js
index 66d37f35638bc..90a69d7bbe45b 100644
--- a/tests/baselines/reference/jsxHasLiteralType.js
+++ b/tests/baselines/reference/jsxHasLiteralType.js
@@ -12,8 +12,41 @@ const m = <MyComponent x="a"/>
 
 //// [jsxHasLiteralType.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 React = require("react");
+var React = __importStar(require("react"));
 class MyComponent extends React.Component {
 }
 const m = React.createElement(MyComponent, { x: "a" });
diff --git a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
index a125ba23aa790..2dfa58382d37a 100644
--- a/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
+++ b/tests/baselines/reference/jsxImportForSideEffectsNonExtantNoError.js
@@ -11,8 +11,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 require("./App.css"); // doesn't actually exist
 const tag = React.createElement("div", null);
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index edcd4023c11fa..b8e7f4bd6798b 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -15,8 +15,11 @@ 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 = require("Test");
+var Test_1 = __importDefault(require("Test"));
 let 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 7166520ddd3be..42d7bba5817a6 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsCompatability.js
@@ -14,9 +14,42 @@ 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 = require("react");
+var React = __importStar(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 2b6f72256d336..9d4d84b5c140e 100644
--- a/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
+++ b/tests/baselines/reference/jsxIntrinsicElementsTypeArgumentErrors.js
@@ -33,9 +33,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 // opening + closing
 const a = React.createElement("div", null); // empty type args
 const b = React.createElement("div", null); // trailing comma type args
diff --git a/tests/baselines/reference/jsxIntrinsicUnions.js b/tests/baselines/reference/jsxIntrinsicUnions.js
index 5b6bc29563064..1116ff2c3b653 100644
--- a/tests/baselines/reference/jsxIntrinsicUnions.js
+++ b/tests/baselines/reference/jsxIntrinsicUnions.js
@@ -13,7 +13,40 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const El = Math.random() ? 'h1' : 'h2';
 const tag = React.createElement(El, { className: "ok", key: "key" }, "Title");
diff --git a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
index 91775ff811897..02741f0bc0459 100644
--- a/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
+++ b/tests/baselines/reference/jsxIssuesErrorWhenTagExpectsTooManyArguments.js
@@ -29,8 +29,41 @@ 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 = require("react");
+var React = __importStar(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 e6058d6b89ae5..c7415fbe30f43 100644
--- a/tests/baselines/reference/jsxNamespaceReexports.js
+++ b/tests/baselines/reference/jsxNamespaceReexports.js
@@ -22,6 +22,39 @@ exports.createElement = createElement;
 function createElement(element, props, ...children) { }
 //// [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 = require("./library");
+var MyLib = __importStar(require("./library"));
 const 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 009386c5b18c5..3ce808d1d7268 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=preserve).js
@@ -36,11 +36,44 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => <h1>Hello world</h1>;
 exports.HelloWorld = HelloWorld;
 exports.frag = <><div></div></>;
@@ -68,21 +101,87 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => <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 = require("./one.js");
-exports.two = require("./two.js");
-exports.three = require("./three.js");
-exports.four = require("./four.js");
+exports.one = __importStar(require("./one.js"));
+exports.two = __importStar(require("./two.js"));
+exports.three = __importStar(require("./three.js"));
+exports.four = __importStar(require("./four.js"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
index c03d8ca2427f6..76f86255a96bf 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react).js
@@ -36,11 +36,44 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -71,12 +104,45 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -84,9 +150,42 @@ 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 = require("./one.js");
-exports.two = require("./two.js");
-exports.three = require("./three.js");
-exports.four = require("./four.js");
+exports.one = __importStar(require("./one.js"));
+exports.two = __importStar(require("./two.js"));
+exports.three = __importStar(require("./three.js"));
+exports.four = __importStar(require("./four.js"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
index c03d8ca2427f6..76f86255a96bf 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsx).js
@@ -36,11 +36,44 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -71,12 +104,45 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -84,9 +150,42 @@ 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 = require("./one.js");
-exports.two = require("./two.js");
-exports.three = require("./three.js");
-exports.four = require("./four.js");
+exports.one = __importStar(require("./one.js"));
+exports.two = __importStar(require("./two.js"));
+exports.three = __importStar(require("./three.js"));
+exports.four = __importStar(require("./four.js"));
diff --git a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
index ff0038217a318..16ee376f3a577 100644
--- a/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxRuntimePragma(jsx=react-jsxdev).js
@@ -36,11 +36,44 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -73,12 +106,45 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const HelloWorld = () => React.createElement("h1", null, "Hello world");
 exports.HelloWorld = HelloWorld;
 exports.frag = React.createElement(React.Fragment, null,
@@ -86,9 +152,42 @@ 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 = require("./one.js");
-exports.two = require("./two.js");
-exports.three = require("./three.js");
-exports.four = require("./four.js");
+exports.one = __importStar(require("./one.js"));
+exports.two = __importStar(require("./two.js"));
+exports.three = __importStar(require("./three.js"));
+exports.four = __importStar(require("./four.js"));
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
index 0df6e9b8e7a26..a557a085b112c 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
@@ -31,8 +31,11 @@ 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 = require("react");
+var react_1 = __importDefault(require("react"));
 const Info = (props) => props.status === "hidden"
     ? react_1.default.createElement("noscript", null)
     : react_1.default.createElement("div", null, props.content);
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 66fe9912e4d7b..e887f316c8e1f 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -24,9 +24,12 @@ class TestComponent extends React.Component<any, {}> {
 
 //// [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 BaseComponent_1 = require("BaseComponent");
+var BaseComponent_1 = __importDefault(require("BaseComponent"));
 class TestComponent extends React.Component {
     render() {
         return <BaseComponent_1.default />;
diff --git a/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js b/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
index 17e01e6a40fca..0ff6fc8623243 100644
--- a/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
+++ b/tests/baselines/reference/keyofModuleObjectHasCorrectKeys.js
@@ -22,6 +22,39 @@ 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 = require("./example");
+var example = __importStar(require("./example"));
 test(example, "default");
diff --git a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
index a7585b517f9d5..afc7fbeff1c6b 100644
--- a/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
+++ b/tests/baselines/reference/legacyNodeModulesExportsSpecifierGenerationConditions.js
@@ -33,6 +33,39 @@ 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) {
@@ -44,5 +77,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = void 0;
-const a = () => __awaiter(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(function () { return require("inner"); })).x(); });
+const a = () => __awaiter(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(function () { return __importStar(require("inner")); })).x(); });
 exports.a = a;
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index 3f332d2d356c5..0c99d5300b74c 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,6 +24,39 @@ 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 = require("passport");
+var passport = __importStar(require("passport"));
 let p = passport.use();
diff --git a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
index 31744db418389..14ce8305a950e 100644
--- a/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
+++ b/tests/baselines/reference/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js
@@ -50,7 +50,40 @@ 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 = require("./reexport");
+var ns = __importStar(require("./reexport"));
 const g = ns.Root.A;
 f.x;
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index 011d72b2fce75..905951ffc961c 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -27,9 +27,43 @@ 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);
     class Test {
         constructor() {
             this.bar = new foo.Foo();
diff --git a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
index e112ffae2889c..44c04563b1c64 100644
--- a/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
+++ b/tests/baselines/reference/moduleNoneDynamicImport(target=es2015).js
@@ -8,4 +8,37 @@ export default 1;
 
 
 //// [a.js]
-const foo = Promise.resolve().then(() => require("b"));
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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")));
diff --git a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
index e992b995bc517..26acc87112bcc 100644
--- a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
+++ b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js
@@ -14,6 +14,39 @@ 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 = require("pkg");
+var p = __importStar(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 e992b995bc517..26acc87112bcc 100644
--- a/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js
+++ b/tests/baselines/reference/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js
@@ -14,6 +14,39 @@ 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 = require("pkg");
+var p = __importStar(require("pkg"));
 p.thing();
diff --git a/tests/baselines/reference/multiline.js b/tests/baselines/reference/multiline.js
index 61871b4eb1294..9e46985c14f5d 100644
--- a/tests/baselines/reference/multiline.js
+++ b/tests/baselines/reference/multiline.js
@@ -69,9 +69,42 @@ 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 = require("react");
+var React = __importStar(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 9dd7dc90e71d7..dcd805c0bf70e 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -30,6 +30,9 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 (0, m1_1.default)();
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index fbf2a88633f22..063bbaeedeb22 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -25,6 +25,9 @@ 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 = require("./m1");
+var m1_1 = __importDefault(require("./m1"));
 (0, m1_1.default)();
diff --git a/tests/baselines/reference/namespaceMemberAccess.js b/tests/baselines/reference/namespaceMemberAccess.js
index 1adce4c49e861..eb5f1ca98e862 100644
--- a/tests/baselines/reference/namespaceMemberAccess.js
+++ b/tests/baselines/reference/namespaceMemberAccess.js
@@ -16,7 +16,40 @@ class 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 });
-var types = require("./a");
+var types = __importStar(require("./a"));
 types.A;
 const { A } = types;
diff --git a/tests/baselines/reference/narrowedImports.js b/tests/baselines/reference/narrowedImports.js
index cdb21762f5314..714c99059ae41 100644
--- a/tests/baselines/reference/narrowedImports.js
+++ b/tests/baselines/reference/narrowedImports.js
@@ -26,9 +26,42 @@ 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 = require("./a");
-var b0 = require("./b");
+var a_1 = __importStar(require("./a"));
+var b0 = __importStar(require("./b"));
 var b1 = require("./b");
 let x;
 if (a_1.default)
diff --git a/tests/baselines/reference/newAbstractInstance2.js b/tests/baselines/reference/newAbstractInstance2.js
index c15444061d7d0..d28b3c8929b7b 100644
--- a/tests/baselines/reference/newAbstractInstance2.js
+++ b/tests/baselines/reference/newAbstractInstance2.js
@@ -16,6 +16,9 @@ class default_1 {
 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 new a_1.default();
diff --git a/tests/baselines/reference/noCrashOnImportShadowing.js b/tests/baselines/reference/noCrashOnImportShadowing.js
index 777ca243edfe2..27d00259288c3 100644
--- a/tests/baselines/reference/noCrashOnImportShadowing.js
+++ b/tests/baselines/reference/noCrashOnImportShadowing.js
@@ -33,18 +33,84 @@ 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 = require("./b");
+var B = __importStar(require("./b"));
 exports.B = B;
 const 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");
 const x = { x: "" };
 a_1.B.zzz;
-var OriginalB = require("./b");
+var OriginalB = __importStar(require("./b"));
 OriginalB.zzz;
 const y = x;
diff --git a/tests/baselines/reference/nodeColonModuleResolution.js b/tests/baselines/reference/nodeColonModuleResolution.js
index 40ba92a641ebd..9991001cf4a0a 100644
--- a/tests/baselines/reference/nodeColonModuleResolution.js
+++ b/tests/baselines/reference/nodeColonModuleResolution.js
@@ -26,6 +26,39 @@ 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 = require("node:ph");
+var ph = __importStar(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 bbf0729e89776..4ac2ca8c3e69a 100644
--- a/tests/baselines/reference/nodeColonModuleResolution2.js
+++ b/tests/baselines/reference/nodeColonModuleResolution2.js
@@ -21,6 +21,39 @@ 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 = require("fake:thing");
+var ph = __importStar(require("fake:thing"));
 console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE);
diff --git a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
index 478d3b018971c..1b45a14d3f8ea 100644
--- a/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
+++ b/tests/baselines/reference/outFilerootDirModuleNamesAmd.js
@@ -13,17 +13,55 @@ 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); });
+    new Promise((resolve_1, reject_1) => { require(["a"], resolve_1, reject_1); }).then(__importStar);
 });
 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/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index f97c2d4ee68f0..a39e146283a8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -1,9 +1,42 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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);
 };
@@ -11,6 +44,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
+    ng = __importStar(ng);
     let MyClass1 = (() => {
         var _a;
         let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index 880da0cfdf600..a0ed1444e8541 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index f97c2d4ee68f0..a39e146283a8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -1,9 +1,42 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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);
 };
@@ -11,6 +44,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
+    ng = __importStar(ng);
     let MyClass1 = (() => {
         var _a;
         let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index 880da0cfdf600..a0ed1444e8541 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index f97c2d4ee68f0..a39e146283a8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -1,9 +1,42 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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);
 };
@@ -11,6 +44,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
+    ng = __importStar(ng);
     let MyClass1 = (() => {
         var _a;
         let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index 880da0cfdf600..a0ed1444e8541 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index f97c2d4ee68f0..a39e146283a8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -1,9 +1,42 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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);
 };
@@ -11,6 +44,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
+    ng = __importStar(ng);
     let MyClass1 = (() => {
         var _a;
         let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index 880da0cfdf600..a0ed1444e8541 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index f97c2d4ee68f0..a39e146283a8f 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -1,9 +1,42 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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);
 };
@@ -11,6 +44,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.MyClass1 = void 0;
+    ng = __importStar(ng);
     let MyClass1 = (() => {
         var _a;
         let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index 880da0cfdf600..a0ed1444e8541 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -1,16 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index 15d7b1dd43044..ebc5f7e045980 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,6 +1,40 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index ae48958106a95..f1fb849ef6505 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("m1");
+var m1 = __importStar(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 dd162fc2f89f2..e88822635f091 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,6 +1,40 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index 9597d626ed7c2..016735824e83a 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("m1");
+var m1 = __importStar(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 fe21f6f2d8ba0..3828e092f9783 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,6 +1,41 @@
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (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/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index 0c0d04b05b279..f42cca3e990bf 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,7 +1,40 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("m1");
-var m4 = require("m4");
+var m1 = __importStar(require("m1"));
+var m4 = __importStar(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/propTypeValidatorInference.js b/tests/baselines/reference/propTypeValidatorInference.js
index dd0e41a1f2203..ee5c592d1671a 100644
--- a/tests/baselines/reference/propTypeValidatorInference.js
+++ b/tests/baselines/reference/propTypeValidatorInference.js
@@ -91,8 +91,41 @@ 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 = require("prop-types");
+var PropTypes = __importStar(require("prop-types"));
 const innerProps = {
     foo: PropTypes.string.isRequired,
     bar: PropTypes.bool,
diff --git a/tests/baselines/reference/reExportDefaultExport.js b/tests/baselines/reference/reExportDefaultExport.js
index b0a50abe5170f..ebbf9189e4ead 100644
--- a/tests/baselines/reference/reExportDefaultExport.js
+++ b/tests/baselines/reference/reExportDefaultExport.js
@@ -22,8 +22,11 @@ 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 = require("./m1");
+var m1_1 = __importDefault(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 623425d82d75f..e861b4770a350 100644
--- a/tests/baselines/reference/reExportJsFromTs.js
+++ b/tests/baselines/reference/reExportJsFromTs.js
@@ -15,7 +15,40 @@ 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 = require("../lib/constants");
+var tsConstants = __importStar(require("../lib/constants"));
 exports.tsConstants = tsConstants;
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.js b/tests/baselines/reference/reactNamespaceImportPresevation.js
index 5a52664ee1338..3f2595dc88e40 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.js
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.js
@@ -15,6 +15,39 @@ 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 = require("my-React-Lib"); // should not be elided
+var myReactLib = __importStar(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 824edc97b3c0b..cd5cd0dc4285c 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -25,9 +25,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 function myHigherOrderComponent(Inner) {
     return class OuterComponent extends React.Component {
         render() {
diff --git a/tests/baselines/reference/reactSFCAndFunctionResolvable.js b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
index 5d19f34b07707..a0f44703c209a 100644
--- a/tests/baselines/reference/reactSFCAndFunctionResolvable.js
+++ b/tests/baselines/reference/reactSFCAndFunctionResolvable.js
@@ -30,8 +30,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const RandomComponent = () => {
     const Component = condition1
         ? Radio
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
index 9183d22f801fd..dab018bb35350 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM.js
@@ -27,8 +27,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const classes = "";
 const rest = {};
 const children = [];
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
index aceeb73ac2b46..8197e6b5d3b5d 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
@@ -27,8 +27,41 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const classes = "";
 const rest = {};
 const children = [];
diff --git a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
index 312a7b6181222..025b8bd54bdb8 100644
--- a/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
+++ b/tests/baselines/reference/reactTransitiveImportHasValidDeclaration.js
@@ -36,8 +36,11 @@ 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 = require("react-emotion");
+var react_emotion_1 = __importDefault(require("react-emotion"));
 const Form = (0, react_emotion_1.default)('div')({ color: "red" });
 exports.default = Form;
 
diff --git a/tests/baselines/reference/reexportMissingDefault.js b/tests/baselines/reference/reexportMissingDefault.js
index 5b1c75d789188..1725ac4b081d4 100644
--- a/tests/baselines/reference/reexportMissingDefault.js
+++ b/tests/baselines/reference/reexportMissingDefault.js
@@ -14,9 +14,12 @@ 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 b_2.default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault2.js b/tests/baselines/reference/reexportMissingDefault2.js
index ed22d1b8871d4..692f273b47bec 100644
--- a/tests/baselines/reference/reexportMissingDefault2.js
+++ b/tests/baselines/reference/reexportMissingDefault2.js
@@ -14,9 +14,12 @@ 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 b_2.default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault3.js b/tests/baselines/reference/reexportMissingDefault3.js
index 22a0fac06cce8..e1e5b82c8594c 100644
--- a/tests/baselines/reference/reexportMissingDefault3.js
+++ b/tests/baselines/reference/reexportMissingDefault3.js
@@ -14,9 +14,12 @@ 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 b_2.default; } });
+Object.defineProperty(exports, "a", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault4.js b/tests/baselines/reference/reexportMissingDefault4.js
index b002bc24e8cd0..374fc21f4afc3 100644
--- a/tests/baselines/reference/reexportMissingDefault4.js
+++ b/tests/baselines/reference/reexportMissingDefault4.js
@@ -10,9 +10,12 @@ 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 b_2.default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
diff --git a/tests/baselines/reference/reexportMissingDefault6.js b/tests/baselines/reference/reexportMissingDefault6.js
index d1ee2ecb562b7..7fa90d4236dfb 100644
--- a/tests/baselines/reference/reexportMissingDefault6.js
+++ b/tests/baselines/reference/reexportMissingDefault6.js
@@ -14,9 +14,12 @@ 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 b_2.default; } });
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } });
diff --git a/tests/baselines/reference/requireAsFunctionInExternalModule.js b/tests/baselines/reference/requireAsFunctionInExternalModule.js
index 5f3b7c3f4dcf5..e49f78b2e7b0a 100644
--- a/tests/baselines/reference/requireAsFunctionInExternalModule.js
+++ b/tests/baselines/reference/requireAsFunctionInExternalModule.js
@@ -25,9 +25,42 @@ 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 = require("./c");
+var c_1 = __importStar(require("./c"));
 function hello() { }
 if ((0, c_1.has)('ember-debug')) {
     (0, c_1.default)('ember-debug');
diff --git a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
index b4106a68f7f6f..85dae49d76992 100644
--- a/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
+++ b/tests/baselines/reference/returnTypePredicateIsInstantiateInContextOfTarget.js
@@ -18,9 +18,42 @@ const TestRender = () => <TestComponent />;
 
 //// [returnTypePredicateIsInstantiateInContextOfTarget.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 = require("react");
+var React = __importStar(require("react"));
 let TestComponent = (() => {
     class TestComponent extends React.Component {
         // Type guard is defined as a static class property
diff --git a/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js b/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
index 53f8df3b93ed1..2f2793acf43c4 100644
--- a/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
+++ b/tests/baselines/reference/reuseProgramStructure/redirect-previous-duplicate-packages.js
@@ -110,7 +110,8 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
-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/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/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 53f8df3b93ed1..2f2793acf43c4 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
@@ -110,7 +110,8 @@ MissingPaths:: [
   "lib.d.ts"
 ]
 
-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/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/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/selfReferentialDefaultNoStackOverflow.js b/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
index 75da3fda1d9e7..efa2069547706 100644
--- a/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
+++ b/tests/baselines/reference/selfReferentialDefaultNoStackOverflow.js
@@ -11,8 +11,11 @@ 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 = require("./QSpinner");
+var QSpinner_1 = __importDefault(require("./QSpinner"));
 exports.default = {
     mixins: [QSpinner_1.default],
     name: 'QSpinner'
diff --git a/tests/baselines/reference/spellingSuggestionJSXAttribute.js b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
index 6c6e766633b04..59c61764d2b79 100644
--- a/tests/baselines/reference/spellingSuggestionJSXAttribute.js
+++ b/tests/baselines/reference/spellingSuggestionJSXAttribute.js
@@ -20,9 +20,42 @@ class MyComp extends React.Component<{ className?: string, htmlFor?: string }> {
 
 //// [spellingSuggestionJSXAttribute.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 = require("react");
+var React = __importStar(require("react"));
 function MyComp2(props) {
     return null;
 }
diff --git a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
index 29f674ced2bbe..63c7809baa15a 100644
--- a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
+++ b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
@@ -61,8 +61,41 @@ 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 = require("./spreadExpressionContextualTypeWithNamespace_0");
+var stuff = __importStar(require("./spreadExpressionContextualTypeWithNamespace_0"));
 stuff.func;
 stuff.klass;
 stuff.obj;
diff --git a/tests/baselines/reference/stackDepthLimitCastingType.js b/tests/baselines/reference/stackDepthLimitCastingType.js
index 9189f04d5f3d1..29bc9ddd739be 100644
--- a/tests/baselines/reference/stackDepthLimitCastingType.js
+++ b/tests/baselines/reference/stackDepthLimitCastingType.js
@@ -41,7 +41,40 @@ 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 = require("backbone");
+var Backbone = __importStar(require("backbone"));
 const hoge = new Backbone.Model();
 hoge.fetch(null);
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
index bcc9d95977dc5..2fb1a85d85724 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js
@@ -29,9 +29,42 @@ 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 = require("package-b");
+var pkg = __importStar(require("package-b"));
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
index 43b73b8609b8b..c63f1f8d94a1f 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js
@@ -31,9 +31,42 @@ 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 = require("package-b");
+var pkg = __importStar(require("package-b"));
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
index bfeee1d566342..4ea2dfa82fa9b 100644
--- a/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
+++ b/tests/baselines/reference/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js
@@ -31,9 +31,42 @@ 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 = require("package-b");
+var pkg = __importStar(require("package-b"));
 exports.a = pkg.invoke();
 
 
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt b/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
new file mode 100644
index 0000000000000..53d0c0e56f0ec
--- /dev/null
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
@@ -0,0 +1,35 @@
+main.ts(3,21): error TS1055: Type '{ 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; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+  Type '{ 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; default: 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 '{ 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; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+  Type '{ 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; default: 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 '{ 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; default: 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 '{ 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; default: 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 '{ 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; default: 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 '{ 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; default: 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 3250bd4a5a7f0..484483f1cf930 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.js
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.js
@@ -24,6 +24,39 @@ 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) {
@@ -35,12 +68,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 // https://github.com/Microsoft/TypeScript/issues/11177
-var Bluebird = require("bluebird");
+var Bluebird = __importStar(require("bluebird"));
 function a() {
-    return __awaiter(this, void 0, Bluebird, function* () {
+    return __awaiter(this, void 0, void 0, function* () {
         try {
             const b = function b() {
-                return __awaiter(this, void 0, Bluebird, function* () {
+                return __awaiter(this, void 0, void 0, function* () {
                     try {
                         yield Bluebird.resolve(); // -- remove this and it compiles
                     }
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
index 893ebeb88355e..f889e1a0b9e85 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 : PromiseConstructor
->         : ^^^^^^^^^^^^^^^^^^
+>Bluebird : { 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; default: PromiseConstructor; }
+>         : ^^^^^^ ^^      ^^                            ^^^                     ^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                                                     ^^^^^^^ ^^      ^^                            ^^^                   ^^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                           ^^^^^^^^^^^^^            ^^^^^^^^^ ^^^^^^^^^^      ^^^   ^^^          ^^^^^^^^^^^^^             ^^^^^^^^^^ ^^     ^^ ^^^                   ^^^^^^^^^^ ^^     ^^                  ^^^                   ^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 async function a(): Bluebird<void> {
 >a : () => Bluebird<void>
@@ -27,13 +27,14 @@ async function a(): Bluebird<void> {
 >                   : ^^^^^^^^^^^^^
 >Bluebird.resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >                 : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
->Bluebird : PromiseConstructor
->         : ^^^^^^^^^^^^^^^^^^
+>Bluebird : { 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; default: PromiseConstructor; }
+>         : ^^^^^^ ^^      ^^                            ^^^                     ^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                                                     ^^^^^^^ ^^      ^^                            ^^^                   ^^^^^^^ ^^^^^^^^^                       ^^      ^^ ^^^                           ^^^^^^^^^^^^^            ^^^^^^^^^ ^^^^^^^^^^      ^^^   ^^^          ^^^^^^^^^^^^^             ^^^^^^^^^^ ^^     ^^ ^^^                   ^^^^^^^^^^ ^^     ^^                  ^^^                   ^^^^^^^^^^^^^^^^^^^^                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >resolve : { (): Promise<void>; <T>(value: T): Promise<Awaited<T>>; <T>(value: T | PromiseLike<T>): Promise<Awaited<T>>; }
 >        : ^^^^^^             ^^^ ^^     ^^ ^^^                   ^^^ ^^     ^^                  ^^^                   ^^^
 
       } catch (error) { }
 >error : any
+>      : ^^^
 
     };
 
@@ -47,6 +48,7 @@ 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 1e1492ad8036a..2752683987cb4 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,15 +1,48 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
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 1e1492ad8036a..2752683987cb4 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,15 +1,48 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
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 1e1492ad8036a..2752683987cb4 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,15 +1,48 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
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 1e1492ad8036a..2752683987cb4 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,15 +1,48 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __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 = require("angular2/core");
+var ng = __importStar(require("angular2/core"));
 let MyClass1 = (() => {
     var _a;
     let MyClass1 = class MyClass1 {
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 b9099960ddc61..65e255fa5c1f9 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,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file");
+exports.alias = __importStar(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 b9099960ddc61..65e255fa5c1f9 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,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file");
+exports.alias = __importStar(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 b9099960ddc61..65e255fa5c1f9 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,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file");
+exports.alias = __importStar(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 b9099960ddc61..65e255fa5c1f9 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,6 +1,39 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("./file");
+exports.alias = __importStar(require("./file"));
 //# sourceMappingURL=module.js.map
\ No newline at end of file
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 f1fd49c2bb25e..b3b5f78ebc772 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
@@ -77,10 +77,14 @@ Found 2 errors.
 
 
 //// [/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({});
 });
 
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 92dd0320ccf9f..e2e144114e8b8 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
@@ -78,10 +78,14 @@ Found 2 errors.
 
 
 //// [/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({});
 });
 
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 eefc544fe74e1..49105aef13518 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
@@ -125,10 +125,13 @@ 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 bar_1.default; } });
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
 
 
 //// [/home/src/workspaces/project/obj/lazyIndex.d.ts]
@@ -137,10 +140,43 @@ 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");
-const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return require('./lazyIndex'); }));
+const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); }));
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => 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 da9caa9c3ca19..e2d0464e2caa8 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
@@ -125,10 +125,13 @@ 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 bar_1.default; } });
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
 
 
 //// [/home/src/workspaces/project/obj/lazyIndex.d.ts]
@@ -137,10 +140,43 @@ 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");
-const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return require('./lazyIndex'); }));
+const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); }));
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => 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 1c546c10e23d6..df502dea4f93c 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
@@ -127,11 +127,14 @@ 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 bar_1.default; } });
-var bar_2 = require("./bar");
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
+var bar_2 = __importDefault(require("./bar"));
 (0, bar_2.default)("hello");
 
 
@@ -141,10 +144,43 @@ 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");
-const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return require('./lazyIndex'); }));
+const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(function () { return __importStar(require('./lazyIndex')); }));
 exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => m.bar);
 
 
@@ -795,11 +831,14 @@ 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 bar_1.default; } });
-var bar_2 = require("./bar");
+Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } });
+var bar_2 = __importDefault(require("./bar"));
 (0, bar_2.default)();
 
 
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 6db8829f82c1e..c0f983c564139 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
@@ -205,18 +205,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -295,13 +328,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 c1218b2e5a117..94a7bc32c3f59 100644
--- a/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js
+++ b/tests/baselines/reference/tsbuild/sample1/building-using-buildReferencedProject.js
@@ -217,18 +217,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 d028bb618eb71..b2426137d64fc 100644
--- a/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js
+++ b/tests/baselines/reference/tsbuild/sample1/building-using-getNextInvalidatedProject.js
@@ -209,18 +209,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -304,13 +337,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 04089a94456ec..3a4115552f465 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
@@ -204,18 +204,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -294,13 +327,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 d3878b4122695..889d5e7317506 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
@@ -204,18 +204,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -294,13 +327,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 c1c736f87a0db..666987369223f 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
@@ -230,18 +230,51 @@ 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,iCAAmC;AACnC,SAAgB,eAAe;IAC3B,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AACvB,CAAC;AACD,2CAA6C;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.muitply();
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -334,13 +367,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 5d8c7f56fd50b..bf251d93ed302 100644
--- a/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/builds-till-project-specified.js
@@ -202,18 +202,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 81d454f0dc4ed..084aebcee73f4 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 6f43032341508..20da336787f9a 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 f8e01e5ab4a69..ce5bc1d69f256 100644
--- a/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js
+++ b/tests/baselines/reference/tsbuild/sample1/cleans-till-project-specified.js
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 ddbf903cbd540..63e1bbfd04100 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
@@ -132,18 +132,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -158,13 +191,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 0c1fd4bc44785..f6bd097cd7d18 100644
--- a/tests/baselines/reference/tsbuild/sample1/explainFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/explainFiles.js
@@ -254,18 +254,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -344,13 +377,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 a58a9a69e4c1b..d7729540588bd 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 2dda6e443a4b6..d9b2212fdb4b6 100644
--- a/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js
+++ b/tests/baselines/reference/tsbuild/sample1/invalidates-projects-correctly.js
@@ -199,18 +199,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -289,13 +322,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -396,18 +462,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 function foo() { }
 //# sourceMappingURL=index.js.map
@@ -494,18 +593,51 @@ 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,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,MAAa,IAAI;CAAG;AAApB,oBAAoB"}
+{"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,MAAa,IAAI;CAAG;AAApB,oBAAoB"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 function foo() { }
 class cNew {
diff --git a/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js b/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
index b4cd9c1e69340..a2cfc8f724a85 100644
--- a/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/listEmittedFiles.js
@@ -219,18 +219,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -309,13 +342,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 1760fd77ef8a7..39653c4596985 100644
--- a/tests/baselines/reference/tsbuild/sample1/listFiles.js
+++ b/tests/baselines/reference/tsbuild/sample1/listFiles.js
@@ -218,18 +218,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -308,13 +341,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 3db8e119645bb..12bfa2a41934f 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 21653971dcffa..273cb2e615c6d 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 7918947467977..ca2785c1f2048 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
@@ -229,18 +229,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -319,13 +352,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 a7103c18122fb..42ffd11533e28 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
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 ff2a32837afb3..0e9a023097c31 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
@@ -225,18 +225,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -321,13 +354,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 da7d95790d2bb..a59274b6b648b 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
@@ -225,18 +225,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -321,13 +354,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 353fd6bed64f1..5bec5d55a96a4 100644
--- a/tests/baselines/reference/tsbuild/sample1/sample.js
+++ b/tests/baselines/reference/tsbuild/sample1/sample.js
@@ -222,18 +222,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -312,13 +345,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -568,26 +634,60 @@ 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(4, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(4, 43) Source(4, 2) + SourceIndex(0)
+1 >Emitted(37, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(37, 43) Source(4, 2) + SourceIndex(0)
 ---
->>>var c = require("../core/index");
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
+>>>var c = __importStar(require("../core/index"));
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
 2 >import * as c from '../core/index';
-1 >Emitted(5, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(5, 34) Source(1, 36) + SourceIndex(0)
+1->Emitted(38, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(38, 48) Source(1, 36) + SourceIndex(0)
 ---
 >>>function getSecondsInDay() {
 1 >
@@ -598,9 +698,9 @@ sourceFile:index.ts
   >
 2 >export function 
 3 >         getSecondsInDay
-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)
+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)
 ---
 >>>    return c.multiply(10, 15);
 1->^^^^
@@ -626,36 +726,36 @@ sourceFile:index.ts
 9 >                          15
 10>                            )
 11>                             ;
-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->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 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0)
+1 >Emitted(41, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(41, 2) Source(4, 2) + SourceIndex(0)
 ---
->>>var mod = require("../core/anotherModule");
+>>>var mod = __importStar(require("../core/anotherModule"));
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >import * as mod from '../core/anotherModule';
-1->Emitted(9, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(9, 44) Source(5, 46) + SourceIndex(0)
+1->Emitted(42, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(42, 58) Source(5, 46) + SourceIndex(0)
 ---
 >>>exports.m = mod;
 1 >
@@ -672,12 +772,12 @@ sourceFile:index.ts
 4 >          = 
 5 >            mod
 6 >               ;
-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)
+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)
 ---
 >>>//# 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 4d4e7c5cf441c..998d9c820f040 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
@@ -414,18 +414,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -504,13 +537,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 2c3438f5d1c54..bad1b900c0bb4 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
@@ -417,18 +417,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -507,13 +540,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 e5eea48486693..b3a623d9e1073 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-declarationMap-changes.js
@@ -222,18 +222,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -312,13 +345,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 4dbb28719da08..f663b35cd63a8 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-esModuleInterop-option-changes.js
@@ -115,6 +115,14 @@ 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]
@@ -223,18 +231,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -329,7 +370,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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
+{"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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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"}
 
 //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -403,13 +444,35 @@ 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": 1606
+  "size": 1647
 }
 
 
-exitCode:: ExitStatus.Success
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 Change:: incremental-declaration-changes
 
@@ -448,7 +511,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 output 'tests/tsconfig.tsbuildinfo' is older than input 'tests/tsconfig.json'
+[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] 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 a1e1a1cd32c13..0dd5900a120b9 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
@@ -222,18 +222,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -312,13 +345,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 4c1c1cf5ae1a6..7707635bc87c2 100644
--- a/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js
+++ b/tests/baselines/reference/tsbuild/sample1/when-logic-specifies-tsBuildInfoFile.js
@@ -223,18 +223,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -314,13 +347,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -570,26 +636,60 @@ 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(4, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(4, 43) Source(4, 2) + SourceIndex(0)
+1 >Emitted(37, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(37, 43) Source(4, 2) + SourceIndex(0)
 ---
->>>var c = require("../core/index");
-1 >
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
+>>>var c = __importStar(require("../core/index"));
+1->
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
 2 >import * as c from '../core/index';
-1 >Emitted(5, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(5, 34) Source(1, 36) + SourceIndex(0)
+1->Emitted(38, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(38, 48) Source(1, 36) + SourceIndex(0)
 ---
 >>>function getSecondsInDay() {
 1 >
@@ -600,9 +700,9 @@ sourceFile:index.ts
   >
 2 >export function 
 3 >         getSecondsInDay
-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)
+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)
 ---
 >>>    return c.multiply(10, 15);
 1->^^^^
@@ -628,36 +728,36 @@ sourceFile:index.ts
 9 >                          15
 10>                            )
 11>                             ;
-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->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 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(8, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(8, 2) Source(4, 2) + SourceIndex(0)
+1 >Emitted(41, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(41, 2) Source(4, 2) + SourceIndex(0)
 ---
->>>var mod = require("../core/anotherModule");
+>>>var mod = __importStar(require("../core/anotherModule"));
 1->
-2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->
   >
 2 >import * as mod from '../core/anotherModule';
-1->Emitted(9, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(9, 44) Source(5, 46) + SourceIndex(0)
+1->Emitted(42, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(42, 58) Source(5, 46) + SourceIndex(0)
 ---
 >>>exports.m = mod;
 1 >
@@ -674,12 +774,12 @@ sourceFile:index.ts
 4 >          = 
 5 >            mod
 6 >               ;
-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)
+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)
 ---
 >>>//# sourceMappingURL=index.js.map
 
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 ec88fff54ba4b..c9d3b34f72fc0 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 6683db1a2edb9..db4c5d29306c2 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
@@ -227,18 +227,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -317,13 +350,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -576,18 +642,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 function someFn() { }
 //# sourceMappingURL=index.js.map
@@ -723,19 +822,52 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 0f00ee3e8d9c9..b60a875123bc2 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -556,18 +622,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 let y = 10;
 //# sourceMappingURL=index.js.map
@@ -923,18 +1022,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 13c442813d65a..75bb5671044fb 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
@@ -209,18 +209,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -299,13 +332,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -557,18 +623,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 let y = 10;
 //# sourceMappingURL=index.js.map
@@ -925,18 +1024,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 22fb543daf3e7..fe4979d04b2f0 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -556,18 +622,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 let 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 3478a6fcd562d..6288c1bd62a24 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
@@ -451,18 +451,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -541,13 +574,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 2f48e012d4599..16a608109b4e4 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
@@ -454,18 +454,51 @@ Output::
 
 
 //// [/user/username/projects/sample1/logic/index.js.map]
-{"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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -544,13 +577,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 ad4e715a89f52..edae839039f21 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 f3876fa1946aa..c312afb6214dd 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
@@ -206,14 +206,47 @@ 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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -225,13 +258,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -498,20 +564,53 @@ 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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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,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"}
+{"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"}
 
 //// [/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":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\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 e83f7e20b8f3e..32a5846f9eb74 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
@@ -206,18 +206,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -296,13 +329,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 a47c5d7d4e70f..c5e77f1913b22 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
@@ -206,18 +206,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -296,13 +329,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 d6dbc86372a6a..add3c9439ada8 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
@@ -206,18 +206,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -296,13 +329,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 bc5672037749d..fd360e1ba86a2 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 cdf76915d6e58..0a188a25f498e 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 12f4576c4b5a6..eb25a34d887b9 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
@@ -210,18 +210,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -300,13 +333,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 e584939dbbf99..b530d490d5f1a 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
@@ -155,7 +155,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: false
+default: true
 
 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 c89ecbd5886a4..951e4c533984e 100644
--- a/tests/baselines/reference/tsc/commandLine/help-all.js
+++ b/tests/baselines/reference/tsc/commandLine/help-all.js
@@ -165,7 +165,7 @@ default: 0
 --allowSyntheticDefaultImports
 Allow 'import x from y' when a module doesn't have a default export.
 type: boolean
-default: module === "system" or esModuleInterop
+default: true
 
 --erasableSyntaxOnly
 Do not allow runtime constructs that are not part of ECMAScript.
@@ -175,7 +175,7 @@ default: false
 --esModuleInterop
 Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility.
 type: boolean
-default: false
+default: true
 
 --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 d879fe2516485..207ef2df02428 100644
--- a/tests/baselines/reference/tsc/commandLine/help.js
+++ b/tests/baselines/reference/tsc/commandLine/help.js
@@ -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: false
+default: true
 
 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 fa9c317c8d314..d49e3abd89474 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
@@ -155,7 +155,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: false
+default: true
 
 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 fa9c317c8d314..d49e3abd89474 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
@@ -155,7 +155,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: false
+default: true
 
 You can learn about all of the compiler options at https://aka.ms/tsc
 
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 eccb650ad0670..1249f5885f6a5 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
@@ -73,10 +73,14 @@ Errors  Files
 
 
 //// [/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({});
 });
 
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 9ea752951d598..7d7844ee66599 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
@@ -71,10 +71,14 @@ Errors  Files
 
 
 //// [/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({});
 });
 
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 64e1cf3740781..165d22a1be434 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
@@ -62,10 +62,13 @@ 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 constants_1.default; } });
+Object.defineProperty(exports, "ConstantNumber", { enumerable: true, get: function () { return __importDefault(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 4a5f8451edd25..21be532bace19 100644
--- a/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js
+++ b/tests/baselines/reference/tsc/incremental/generates-typerefs-correctly.js
@@ -91,10 +91,43 @@ 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 = require("./box.js");
-var W = require("./wrap.js");
+var B = __importStar(require("./box.js"));
+var W = __importStar(require("./wrap.js"));
 /**
  * @template {object} C
  * @param {C} source
@@ -233,10 +266,43 @@ 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 = require("./box.js");
-var W = require("./wrap.js");
+var B = __importStar(require("./box.js"));
+var W = __importStar(require("./wrap.js"));
 /**
  * @template {object} C
  * @param {C} source
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 bfd72a0ba077e..0364d1e6b684a 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-incremental.js
@@ -39,8 +39,11 @@ 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 = require("classnames");
+var classnames_1 = __importDefault(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 8176b25a3da2d..2a2e3291851c2 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -44,8 +44,11 @@ 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 = require("classnames");
+var classnames_1 = __importDefault(require("classnames"));
 (0, classnames_1.default)().foo;
 
 
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 95277a11f3830..c19c9f318cc54 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/late-discovered-dependency-symlink.js
@@ -149,9 +149,42 @@ 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 = require("package-b");
+var pkg = __importStar(require("package-b"));
 exports.a = pkg.invoke();
 
 
@@ -294,9 +327,42 @@ 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 = require("package-b");
+var pkg = __importStar(require("package-b"));
 exports.aa = pkg.invoke();
 
 
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 fe33a4d57dcfc..7d27b35e1974d 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
@@ -35,8 +35,41 @@ 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 = require("./moduleFile");
+var T = __importStar(require("./moduleFile"));
 T.bar();
 
 
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 5836c37261ad9..bef952faf05dd 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
@@ -44,8 +44,41 @@ 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 = require("./moduleFile");
+var T = __importStar(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 873bf0e4fed65..0614f3b531649 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
@@ -41,8 +41,41 @@ 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 = require("./moduleFile");
+var T = __importStar(require("./moduleFile"));
 T.bar();
 
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index ab985a40ce7a1..d4dd16e0771f1 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -200,18 +200,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
@@ -290,13 +323,46 @@ 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 = require("../core/index");
-var logic = require("../logic/index");
+var c = __importStar(require("../core/index"));
+var logic = __importStar(require("../logic/index"));
 c.leftPad("", 10);
 logic.getSecondsInDay();
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 
 
@@ -524,18 +590,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 function foo() { }
 //# sourceMappingURL=index.js.map
@@ -624,19 +723,52 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 function foo() { }
 function gfoo() { }
@@ -900,15 +1032,48 @@ 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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(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 8a730b25e7627..3080638347f11 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
@@ -232,18 +232,51 @@ 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,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"}
+{"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"}
 
 //// [/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 = require("../core/index");
+var c = __importStar(require("../core/index"));
 function getSecondsInDay() {
     return c.multiply(10, 15);
 }
-var mod = require("../core/anotherModule");
+var mod = __importStar(require("../core/anotherModule"));
 exports.m = mod;
 //# sourceMappingURL=index.js.map
 
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 d82c0b14f86bd..d22748e31af75 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
@@ -48,8 +48,11 @@ 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 = require("./data.json");
+var data_json_1 = __importDefault(require("./data.json"));
 let x = data_json_1.default;
 
 
diff --git a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
index 93bdd46786f27..730c0464734df 100644
--- a/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
+++ b/tests/baselines/reference/tsconfigMapOptionsAreCaseInsensitive.js
@@ -17,10 +17,14 @@ 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);
     const x = 10 + other_js_1.default;
     exports.x = x;
 });
diff --git a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
index 18578482e1251..8e85e0774682e 100644
--- a/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
+++ b/tests/baselines/reference/tsxDeepAttributeAssignabilityError.js
@@ -27,17 +27,83 @@ 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 = require("react");
+var React = __importStar(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 = require("react");
+var React = __importStar(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 cc507ce7bed1a..ba35879489559 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -29,6 +29,9 @@ let SomeClass = (() => {
 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 let a = a_1.default.E.one;
diff --git a/tests/baselines/reference/tsxDynamicTagName5.js b/tests/baselines/reference/tsxDynamicTagName5.js
index d20d19bba5105..063479ea86337 100644
--- a/tests/baselines/reference/tsxDynamicTagName5.js
+++ b/tests/baselines/reference/tsxDynamicTagName5.js
@@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> {
 
 //// [app.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.Text = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 class Text extends React.Component {
     constructor() {
         super(...arguments);
diff --git a/tests/baselines/reference/tsxDynamicTagName7.js b/tests/baselines/reference/tsxDynamicTagName7.js
index 24942e933576c..ede788ac1e5c7 100644
--- a/tests/baselines/reference/tsxDynamicTagName7.js
+++ b/tests/baselines/reference/tsxDynamicTagName7.js
@@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> {
 
 //// [app.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.Text = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 class Text extends React.Component {
     constructor() {
         super(...arguments);
diff --git a/tests/baselines/reference/tsxDynamicTagName8.js b/tests/baselines/reference/tsxDynamicTagName8.js
index 28df69cccae4d..87c387c17368a 100644
--- a/tests/baselines/reference/tsxDynamicTagName8.js
+++ b/tests/baselines/reference/tsxDynamicTagName8.js
@@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> {
 
 //// [app.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.Text = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 class Text extends React.Component {
     constructor() {
         super(...arguments);
diff --git a/tests/baselines/reference/tsxDynamicTagName9.js b/tests/baselines/reference/tsxDynamicTagName9.js
index 258a2434659a0..ab39f7bb67857 100644
--- a/tests/baselines/reference/tsxDynamicTagName9.js
+++ b/tests/baselines/reference/tsxDynamicTagName9.js
@@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> {
 
 //// [app.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.Text = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 class Text extends React.Component {
     constructor() {
         super(...arguments);
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
index 96bd199c1fc3f..701ec8d8b1c39 100644
--- a/tests/baselines/reference/tsxElementResolution19.js
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -28,8 +28,41 @@ class 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;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; 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 = require("react");
+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 72b62e25134ed..460cceb22cbf1 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit1.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit1.js
@@ -32,9 +32,42 @@ export class Button extends React.Component<any, any> {
 
 //// [button.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.Button = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 class Button extends React.Component {
     render() {
         return <button>Some button</button>;
@@ -43,9 +76,42 @@ class Button extends React.Component {
 exports.Button = Button;
 //// [app.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.App = void 0;
-var React = require("react");
+var React = __importStar(require("react"));
 // Should see var button_1 = require('./button') here
 var button_1 = require("./button");
 class App extends React.Component {
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index 02277011f9ac0..4f0646a95c915 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -29,8 +29,11 @@ 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 = require("mod");
+var mod_1 = __importDefault(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 154f86126cad5..f88a4e50666e3 100644
--- a/tests/baselines/reference/tsxFragmentChildrenCheck.js
+++ b/tests/baselines/reference/tsxFragmentChildrenCheck.js
@@ -37,8 +37,41 @@ function MyComponent(props) {
 }
 //// [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 React = require("react");
+var React = __importStar(require("react"));
 var my_component_1 = require("./my-component");
 const MY_STRING = 'Ceci n\'est pas une string.';
 const MY_CLASSNAME = 'jeclass';
diff --git a/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js b/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
index 159705247f310..3b79bb28148b0 100644
--- a/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
+++ b/tests/baselines/reference/tsxNoTypeAnnotatedSFC.js
@@ -12,9 +12,42 @@ 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 = require("react");
+var React = __importStar(require("react"));
 const Test123 = () => <div />;
 function testComponent(props) {
     return <Test123 {...props}/>;
diff --git a/tests/baselines/reference/typeAndNamespaceExportMerge.js b/tests/baselines/reference/typeAndNamespaceExportMerge.js
index 73b002cf09ad5..6c8e5331ddf46 100644
--- a/tests/baselines/reference/typeAndNamespaceExportMerge.js
+++ b/tests/baselines/reference/typeAndNamespaceExportMerge.js
@@ -24,9 +24,42 @@ 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 = require("./constants");
+exports.Drink = __importStar(require("./constants"));
 //// [index.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/umd-augmentation-1.js b/tests/baselines/reference/umd-augmentation-1.js
index 07677b4636920..846708072e173 100644
--- a/tests/baselines/reference/umd-augmentation-1.js
+++ b/tests/baselines/reference/umd-augmentation-1.js
@@ -40,9 +40,42 @@ 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 = require("math2d");
+var m = __importStar(require("math2d"));
 let v = new m.Vector(3, 2);
 let magnitude = m.getLength(v);
 let p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd-augmentation-3.js b/tests/baselines/reference/umd-augmentation-3.js
index 106cd48365fb7..ff4fe9c5bc5e0 100644
--- a/tests/baselines/reference/umd-augmentation-3.js
+++ b/tests/baselines/reference/umd-augmentation-3.js
@@ -46,9 +46,42 @@ 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 = require("math2d");
+var m = __importStar(require("math2d"));
 let v = new m.Vector(3, 2);
 let magnitude = m.getLength(v);
 let p = v.translate(5, 5);
diff --git a/tests/baselines/reference/umd3.js b/tests/baselines/reference/umd3.js
index d6d400dc748f6..b49b15db0477f 100644
--- a/tests/baselines/reference/umd3.js
+++ b/tests/baselines/reference/umd3.js
@@ -15,8 +15,41 @@ 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 = require("./foo");
+var Foo = __importStar(require("./foo"));
 Foo.fn();
 let x;
 let y = x.n;
diff --git a/tests/baselines/reference/umd4.js b/tests/baselines/reference/umd4.js
index c077b0f2f95e2..8e3ffc73c854a 100644
--- a/tests/baselines/reference/umd4.js
+++ b/tests/baselines/reference/umd4.js
@@ -15,8 +15,41 @@ 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 = require("./foo");
+var Bar = __importStar(require("./foo"));
 Bar.fn();
 let x;
 let y = x.n;
diff --git a/tests/baselines/reference/umd5.js b/tests/baselines/reference/umd5.js
index 448516459c523..cbae092a7fa7a 100644
--- a/tests/baselines/reference/umd5.js
+++ b/tests/baselines/reference/umd5.js
@@ -17,8 +17,41 @@ 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 = require("./foo");
+var Bar = __importStar(require("./foo"));
 Bar.fn();
 let x;
 let y = x.n;
diff --git a/tests/baselines/reference/umd8.symbols b/tests/baselines/reference/umd8.symbols
index 7809a99f8fbca..0cb5bdf2f270f 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(ff.foo, Decl(foo.d.ts, 0, 21))
+>y.foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21))
 >y : Symbol(y, Decl(a.ts, 3, 3))
->foo : Symbol(ff.foo, Decl(foo.d.ts, 0, 21))
+>foo : Symbol(Thing.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 180d98358b78d..57d63c467b132 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 : ff
->  : ^^
+>y : import("foo")
+>  : ^^^^^^^^^^^^^
 
 y.foo();
 >y.foo() : number
 >        : ^^^^^^
 >y.foo : () => number
 >      : ^^^^^^      
->y : ff
->  : ^^
+>y : import("foo")
+>  : ^^^^^^^^^^^^^
 >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 ff
->    : ^^^^^^^^^
+>Foo : typeof import("foo")
+>    : ^^^^^^^^^^^^^^^^^^^^
 
 === foo.d.ts ===
 declare class Thing {
diff --git a/tests/baselines/reference/untypedModuleImport.js b/tests/baselines/reference/untypedModuleImport.js
index 9f93f968c4bfa..df5bac74f5a10 100644
--- a/tests/baselines/reference/untypedModuleImport.js
+++ b/tests/baselines/reference/untypedModuleImport.js
@@ -20,8 +20,41 @@ 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 = require("foo");
+var foo = __importStar(require("foo"));
 foo.bar();
 //// [b.js]
 "use strict";
@@ -30,8 +63,41 @@ 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 = require("foo");
+var foo_1 = __importStar(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 c4bbe0d49f8c6..8a972c0a66378 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.js
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.js
@@ -10,6 +10,9 @@ 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 = require("foo");
+var foo_1 = __importDefault(require("foo"));
 foo_1.default.bar();
diff --git a/tests/baselines/reference/unusedImports11.js b/tests/baselines/reference/unusedImports11.js
index bb6c6258fd3a5..eca289af53f34 100644
--- a/tests/baselines/reference/unusedImports11.js
+++ b/tests/baselines/reference/unusedImports11.js
@@ -27,10 +27,43 @@ 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 = require("./b");
-var ns = require("./b");
+var b_2 = __importStar(require("./b"));
+var ns = __importStar(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 1dadad07694cb..b6d5357aeb4de 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 ns
->  : ^^^^^^^^^
+>r : typeof r
+>  : ^^^^^^^^
 
 new Member();
 >new Member() : Member
@@ -54,8 +54,8 @@ new r.Member();
 >               : ^^^^^^
 >r.Member : typeof Member
 >         : ^^^^^^^^^^^^^
->r : typeof ns
->  : ^^^^^^^^^
+>r : typeof r
+>  : ^^^^^^^^
 >Member : typeof Member
 >       : ^^^^^^^^^^^^^
 
diff --git a/tests/baselines/reference/unusedImports12.types b/tests/baselines/reference/unusedImports12.types
index 9c3f212fc7ecf..a1064cb5ba1f9 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 ns
->  : ^^^^^^^^^
+>r : typeof r
+>  : ^^^^^^^^
 
 === b.ts ===
 export class Member {}
diff --git a/tests/baselines/reference/unusedImports_entireImportDeclaration.js b/tests/baselines/reference/unusedImports_entireImportDeclaration.js
index 14189021e317d..4a988d666aa0a 100644
--- a/tests/baselines/reference/unusedImports_entireImportDeclaration.js
+++ b/tests/baselines/reference/unusedImports_entireImportDeclaration.js
@@ -26,10 +26,46 @@ 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 = require("./a");
+var a_1 = __importDefault(require("./a"));
 a_1.default;
-var a_2 = require("./a");
+var a_2 = __importDefault(require("./a"));
 a_2.default;
-var ns3 = require("./a");
+var ns3 = __importStar(require("./a"));
 ns3;
diff --git a/tests/baselines/reference/unusedImports_entireImportDeclaration.types b/tests/baselines/reference/unusedImports_entireImportDeclaration.types
index 5d8ef7954cc97..be4d60f3070bc 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 ns
->    : ^^^^^^^^^
+>ns2 : typeof ns2
+>    : ^^^^^^^^^^
 
 d4;
 >d4 : 0
@@ -63,10 +63,10 @@ d4;
 import d5, * as ns3 from "./a";
 >d5 : 0
 >   : ^
->ns3 : typeof ns
->    : ^^^^^^^^^
+>ns3 : typeof ns3
+>    : ^^^^^^^^^^
 
 ns3;
->ns3 : typeof ns
->    : ^^^^^^^^^
+>ns3 : typeof ns3
+>    : ^^^^^^^^^^
 
diff --git a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
index 906193198aeca..226eefca29382 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt
@@ -1,6 +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.
 /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/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts b/tests/cases/fourslash/importNameCodeFixNewImportExportEqualsESNextInteropOff.ts
index db0c12dd5e03c..303d79a67cc70 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 * as foo from "foo";
+verify.importFixAtPosition([`import foo from "foo";
 
 foo`]);
diff --git a/tests/cases/fourslash/importTypeCompletions7.ts b/tests/cases/fourslash/importTypeCompletions7.ts
index 22fa2076bcd62..e24e1519772d7 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 * as Foo from \"./foo\";",
+        insertText: "import Foo from \"./foo\";",
         replacementSpan: test.ranges()[0]
     }, {
         name: "type",
diff --git a/tests/cases/fourslash/javascriptModules24.ts b/tests/cases/fourslash/javascriptModules24.ts
index c868d0c9748f6..53022eb53ab44 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) foo(): number\nimport foo");
+verify.errorExistsBeforeMarker('1');
+verify.quickInfoIs("(alias) function foo(): number\n(alias) namespace foo\nimport foo");
 verify.signatureHelp({ marker: "2", argumentCount: 1 });