9
9
using System ;
10
10
using System . IO ;
11
11
using System . Collections . Generic ;
12
+ using System . Linq ;
12
13
using System . Text . RegularExpressions ;
13
14
using System . Threading . Tasks ;
14
15
using Microsoft . AspNetCore . SpaServices . Extensions . Util ;
@@ -63,7 +64,7 @@ public static void Attach(
63
64
}
64
65
65
66
private static async Task < int > StartDevServerAsync (
66
- string sourcePath , string npmScriptName , string waitText , string serverName , ILogger logger , IDictionary < string , string > extraArgs )
67
+ string sourcePath , string npmScriptName , string waitText , string serverName , ILogger logger , Dictionary < string , string > extraArgs = null )
67
68
{
68
69
var portNumber = TcpPortFinder . FindAvailablePort ( ) ;
69
70
logger . LogInformation ( $ "Starting { serverName } server on port { portNumber } ...") ;
@@ -72,8 +73,17 @@ private static async Task<int> StartDevServerAsync(
72
73
{
73
74
{ "PORT" , portNumber . ToString ( ) }
74
75
} ;
76
+ if ( extraArgs == null )
77
+ {
78
+ extraArgs = new Dictionary < string , string >
79
+ {
80
+ { "BROWSER" , "None" }
81
+ } ;
82
+ }
83
+ var extraKeys = new HashSet < string > ( extraArgs . Keys ) ;
84
+ extraKeys . UnionWith ( envVars . Keys ) ;
75
85
var npmScriptRunner = new NpmScriptRunner (
76
- sourcePath , npmScriptName , null , envVars . Union ( extraArgs ) ) ;
86
+ sourcePath , npmScriptName , null , envVars ) ;
77
87
npmScriptRunner . AttachToLogger ( logger ) ;
78
88
79
89
using ( var stdErrReader = new EventedStreamStringReader ( npmScriptRunner . StdErr ) )
0 commit comments