From 746e39e9e90c5ad68846778f35f8b2ff0a77250f Mon Sep 17 00:00:00 2001 From: Andy Date: Thu, 16 Aug 2018 15:12:38 -0700 Subject: [PATCH] Set "rootDir" for cancellationToken project (#26498) --- scripts/configurePrerelease.ts | 4 ++-- src/cancellationToken/tsconfig.json | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/configurePrerelease.ts b/scripts/configurePrerelease.ts index 2377b5d4712..93bcc004dea 100644 --- a/scripts/configurePrerelease.ts +++ b/scripts/configurePrerelease.ts @@ -55,13 +55,13 @@ function main(): void { function updateTsFile(tsFilePath: string, tsFileContents: string, majorMinor: string, patch: string, nightlyPatch: string): string { const majorMinorRgx = /export const versionMajorMinor = "(\d+\.\d+)"/; const majorMinorMatch = majorMinorRgx.exec(tsFileContents); - assert(majorMinorMatch !== null, `The file seems to no longer have a string matching '${majorMinorRgx}'.`); + assert(majorMinorMatch !== null, `The file '${tsFilePath}' seems to no longer have a string matching '${majorMinorRgx}'.`); const parsedMajorMinor = majorMinorMatch![1]; assert(parsedMajorMinor === majorMinor, `versionMajorMinor does not match. ${tsFilePath}: '${parsedMajorMinor}'; package.json: '${majorMinor}'`); const versionRgx = /export const version = `\$\{versionMajorMinor\}\.(\d)(-dev)?`;/; const patchMatch = versionRgx.exec(tsFileContents); - assert(patchMatch !== null, "The file seems to no longer have a string matching " + versionRgx.toString()); + assert(patchMatch !== null, `The file '${tsFilePath}' seems to no longer have a string matching '${versionRgx.toString()}'.`); const parsedPatch = patchMatch![1]; if (parsedPatch !== patch) { throw new Error(`patch does not match. ${tsFilePath}: '${parsedPatch}; package.json: '${patch}'`); diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json index 98e8512e9ac..e16ce22120e 100644 --- a/src/cancellationToken/tsconfig.json +++ b/src/cancellationToken/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../tsconfig-base", "compilerOptions": { "outDir": "../../built/local/", + "rootDir": ".", "composite": false, "declaration": false, "declarationMap": false,