Merge branch 'master' into changelog/minFindSymbolsFilterLength

akshita31 · web-flow · commit 234774b3a67e · 2018-10-01T13:38:22.000-07:00
diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts
@@ -137,7 +137,7 @@ export class CSharpConfigurationProvider implements vscode.DebugConfigurationPro
 
         // read from envFile and set config.env
         if (config.envFile) {
-            config = this.parseEnvFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.path), config);
+            config = this.parseEnvFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.fsPath), config);
         }
 
         // vsdbg will error check the debug configuration fields      

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ export class CSharpConfigurationProvider implements vscode.DebugConfigurationPro`
`137`	`137`
`138`	`138`	`// read from envFile and set config.env`
`139`	`139`	`if (config.envFile) {`
`140`		`- config = this.parseEnvFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.path), config);`
	`140`	`+ config = this.parseEnvFile(config.envFile.replace(/\${workspaceFolder}/g, folder.uri.fsPath), config);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`// vsdbg will error check the debug configuration fields`