From 0fbc3d1cb60b7c2c625001bed453b444356faa39 Mon Sep 17 00:00:00 2001 From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com> Date: Fri, 8 May 2020 14:49:49 -0700 Subject: [PATCH] Get rid of red herrings (#10309) --- extensions/notebook/src/jupyter/jupyterServerInstallation.ts | 5 ----- extensions/notebook/src/jupyter/jupyterSessionManager.ts | 5 ----- 2 files changed, 10 deletions(-) diff --git a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts index adc1f928e4..fd3cb5e578 100644 --- a/extensions/notebook/src/jupyter/jupyterServerInstallation.ts +++ b/extensions/notebook/src/jupyter/jupyterServerInstallation.ts @@ -333,11 +333,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation { delete env['Path']; // Delete extra 'Path' variable for Windows, just in case. env['PATH'] = this.pythonEnvVarPath; - // We don't want Jupyter to know about DOTNET_ROOT, as it's been modified by the liveshare experience - // Without this, won't be able to find the ASP.NET bits - if (process.env['DOTNET_ROOT']) { - delete env['DOTNET_ROOT']; - } this.execOptions = { env: env }; diff --git a/extensions/notebook/src/jupyter/jupyterSessionManager.ts b/extensions/notebook/src/jupyter/jupyterSessionManager.ts index c9ec7503b8..e8eee2adea 100644 --- a/extensions/notebook/src/jupyter/jupyterSessionManager.ts +++ b/extensions/notebook/src/jupyter/jupyterSessionManager.ts @@ -348,11 +348,6 @@ export class JupyterSession implements nb.ISession { } for (let i = 0; i < Object.keys(process.env).length; i++) { let key = Object.keys(process.env)[i]; - // DOTNET_ROOT gets set as part of the liveshare experience, but confuses the dotnet interactive kernel - // Not setting this environment variable for notebooks removes this issue - if (key.toLowerCase() === 'dotnet_root') { - continue; - } if (key.toLowerCase() === 'path' && this._pythonEnvVarPath) { allCode += `%set_env ${key}=${this._pythonEnvVarPath}${EOL}`; } else {