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'
diff --git a/tsconfig.json b/tsconfig.json
index bc0dac725d..eeb3c3222e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "compilerOptions": {
+        "rootDir": ".",
         "module": "commonjs",
         "target": "es6",
         "outDir": "out",
@@ -9,4 +10,4 @@
     "exclude": [
         "node_modules"
     ]
-}
\ No newline at end of file
+}