ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of red herrings (#10309)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-05-08 14:49:49 -07:00
committed by GitHub
parent 3a70bea70d
commit 0fbc3d1cb6
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/notebook/src/jupyter/jupyterServerInstallation.ts
View File

@@ -333,11 +333,6 @@ export class JupyterServerInstallation implements IJupyterServerInstallation {
delete env['Path']; // Delete extra 'Path' variable for Windows, just in case. delete env['Path']; // Delete extra 'Path' variable for Windows, just in case.
env['PATH'] = this.pythonEnvVarPath; 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 = { this.execOptions = {
env: env env: env
}; };

5
extensions/notebook/src/jupyter/jupyterSessionManager.ts
View File

@@ -348,11 +348,6 @@ export class JupyterSession implements nb.ISession {
} }
for (let i = 0; i < Object.keys(process.env).length; i++) { for (let i = 0; i < Object.keys(process.env).length; i++) {
let key = Object.keys(process.env)[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) { if (key.toLowerCase() === 'path' && this._pythonEnvVarPath) {
allCode += `%set_env ${key}=${this._pythonEnvVarPath}${EOL}`; allCode += `%set_env ${key}=${this._pythonEnvVarPath}${EOL}`;
} else { } else {