From 6d13708b7a82f0a79691432f99ed8cdc0efa2f5b Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 13 May 2019 10:03:07 -0700 Subject: [PATCH 1/4] add rich nav --- .vsts-ci/azure-pipelines-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml index 7fba9ada74..1d4852bda5 100644 --- a/.vsts-ci/azure-pipelines-ci.yml +++ b/.vsts-ci/azure-pipelines-ci.yml @@ -38,6 +38,15 @@ jobs: vmImage: 'VS2017-Win2016' steps: - template: templates/ci-general.yml + # Note, this task should only be run once and on Windows only. + - task: RichCodeNavIndexer@0 + continueOnError: true + inputs: + serviceConnection: 'rich-nav' + nugetServiceConnection: 'rich-nav-nuget' + githubServiceConnection: 'PowerShell' + languages: 'typescript,csharp' + serviceEndpoint: 'https://prod.richnav.vsengsaas.visualstudio.com' - job: macOS pool: From f2afbf91f0fcbed84c83ec88eefe9dfbaf18af38 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 13 May 2019 10:33:05 -0700 Subject: [PATCH 2/4] move to CI template --- .vsts-ci/azure-pipelines-ci.yml | 9 --------- .vsts-ci/templates/ci-general.yml | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.vsts-ci/azure-pipelines-ci.yml b/.vsts-ci/azure-pipelines-ci.yml index 1d4852bda5..7fba9ada74 100644 --- a/.vsts-ci/azure-pipelines-ci.yml +++ b/.vsts-ci/azure-pipelines-ci.yml @@ -38,15 +38,6 @@ jobs: vmImage: 'VS2017-Win2016' steps: - template: templates/ci-general.yml - # Note, this task should only be run once and on Windows only. - - task: RichCodeNavIndexer@0 - continueOnError: true - inputs: - serviceConnection: 'rich-nav' - nugetServiceConnection: 'rich-nav-nuget' - githubServiceConnection: 'PowerShell' - languages: 'typescript,csharp' - serviceEndpoint: 'https://prod.richnav.vsengsaas.visualstudio.com' - job: macOS pool: diff --git a/.vsts-ci/templates/ci-general.yml b/.vsts-ci/templates/ci-general.yml index bbc75f3c2f..d37ef417c5 100644 --- a/.vsts-ci/templates/ci-general.yml +++ b/.vsts-ci/templates/ci-general.yml @@ -18,3 +18,14 @@ steps: inputs: ArtifactName: vscode-powershell PathtoPublish: '$(Build.ArtifactStagingDirectory)' + # Rich Navigation + - task: RichCodeNavIndexer@0 + # Note, for now, this is Windows only. + condition: and(succeededOrFailed(), eq(variables['Agent.OS'], 'Windows_NT')) + continueOnError: true + inputs: + serviceConnection: 'rich-nav' + nugetServiceConnection: 'rich-nav-nuget' + githubServiceConnection: 'PowerShell' + languages: 'typescript,csharp' + serviceEndpoint: 'https://prod.richnav.vsengsaas.visualstudio.com' From 731af645def79209dc2b590e861022a141123e00 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 13 May 2019 10:52:19 -0700 Subject: [PATCH 3/4] add rootDir for Rich Nav --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index bc0dac725d..5007f3307a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "rootDir": "src", "module": "commonjs", "target": "es6", "outDir": "out", @@ -9,4 +10,4 @@ "exclude": [ "node_modules" ] -} \ No newline at end of file +} From e29c7923839227f3f3a0efbdcea2f396558cad7d Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 13 May 2019 11:26:50 -0700 Subject: [PATCH 4/4] change to current directory --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 5007f3307a..eeb3c3222e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "rootDir": "src", + "rootDir": ".", "module": "commonjs", "target": "es6", "outDir": "out",