Support release mode for eval

seesharper · seesharper · commit 06b4293ab586 · 2018-04-14T21:06:47.000+02:00
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -175,6 +175,14 @@ public void ShouldEvaluateCode()
             Assert.Contains("12345", result.output);
         }
 
+        [Fact]
+        public void ShouldEvaluateCodeInReleaseMode()
+        {
+            var code = File.ReadAllText(Path.Combine("..", "..", "..", "TestFixtures", "Configuration", "Configuration.csx"));
+            var result = ExecuteCodeInReleaseMode(code);
+            Assert.Contains("false", result.output, StringComparison.OrdinalIgnoreCase);
+        }
+
         [Fact]
         public void ShouldSupportInlineNugetReferencesinEvaluatedCode()
         {
@@ -266,6 +274,12 @@ private static (string output, int exitCode) ExecuteCode(string code)
             return result;
         }
 
+        private static (string output, int exitCode) ExecuteCodeInReleaseMode(string code)
+        {
+            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"-c", new[] {"release", "eval", $"\"{code}\"" }));
+            return result;
+        }
+
         /// <summary>
         /// Use this method if you need to debug 
         /// </summary>        
@@ -280,6 +294,21 @@ private static int ExecuteInProcess(string fixture, params string[] arguments)
             return Program.Main(allArguments.ToArray());
         }
 
+        /// <summary>
+        /// Use this method if you need to debug 
+        /// </summary>        
+        private static int ExecuteCodeProcess(string code, params string[] arguments)
+        {            
+            var allArguments = new List<string>();
+            if (arguments != null)
+            {
+                allArguments.AddRange(arguments);
+            }
+            allArguments.Add("eval");
+            allArguments.Add(code);
+            return Program.Main(allArguments.ToArray());
+        }
+
         private static string[] GetDotnetScriptArguments(string fixture, params string[] arguments)
         {
             string configuration;
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
@@ -80,8 +80,13 @@ private static int Wain(string[] args)
                 {
                     int exitCode = 0;
                     if (!string.IsNullOrWhiteSpace(code.Value))
-                    {                        
-                        exitCode = await RunCode(code.Value, debugMode.HasValue(), app.RemainingArguments.Concat(argsAfterDoubleHypen), cwd.Value());                        
+                    {
+                        var optimizationLevel = OptimizationLevel.Debug;
+                        if (configuration.HasValue() && configuration.Value().ToLower() == "release")
+                        {
+                            optimizationLevel = OptimizationLevel.Release;
+                        }
+                        exitCode = await RunCode(code.Value, debugMode.HasValue(), optimizationLevel, app.RemainingArguments.Concat(argsAfterDoubleHypen), cwd.Value());                        
                     }
                     return exitCode;
                 });
@@ -145,8 +150,8 @@ private static async Task<int> RunScript(string file, bool debugMode, Optimizati
                 if (IsHttpUri(file))
                 {
                     var downloader = new ScriptDownloader();
-                    var scriptFile = await downloader.Download(file);
-                    var exitCode = await RunScript(scriptFile, debugMode, optimizationLevel, args, interactive);
+                    var scriptFile = await downloader.Download(file);                    
+                    var exitCode = await RunScript(scriptFile, debugMode, optimizationLevel, args, interactive);                    
                     File.Delete(scriptFile);
                     return exitCode; 
                 }
@@ -186,10 +191,10 @@ private static async Task RunInteractive(bool debugMode)
             await runner.RunLoop();
         }
 
-        private static Task<int> RunCode(string code, bool debugMode, IEnumerable<string> args, string currentWorkingDirectory)
+        private static Task<int> RunCode(string code, bool debugMode, OptimizationLevel optimizationLevel, IEnumerable<string> args, string currentWorkingDirectory)
         {
             var sourceText = SourceText.From(code);
-            var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), args, null, scriptMode: ScriptMode.Eval);
+            var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), args, null,optimizationLevel, ScriptMode.Eval);
             return Run(debugMode, context);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,13 @@ private static int Wain(string[] args)`
`80`	`80`	`{`
`81`	`81`	`int exitCode = 0;`
`82`	`82`	`if (!string.IsNullOrWhiteSpace(code.Value))`
`83`		`- {`
`84`		`- exitCode = await RunCode(code.Value, debugMode.HasValue(), app.RemainingArguments.Concat(argsAfterDoubleHypen), cwd.Value());`
	`83`	`+ {`
	`84`	`+ var optimizationLevel = OptimizationLevel.Debug;`
	`85`	`+ if (configuration.HasValue() && configuration.Value().ToLower() == "release")`
	`86`	`+ {`
	`87`	`+ optimizationLevel = OptimizationLevel.Release;`
	`88`	`+ }`
	`89`	`+ exitCode = await RunCode(code.Value, debugMode.HasValue(), optimizationLevel, app.RemainingArguments.Concat(argsAfterDoubleHypen), cwd.Value());`
`85`	`90`	`}`
`86`	`91`	`return exitCode;`
`87`	`92`	`});`
`@@ -145,8 +150,8 @@ private static async Task<int> RunScript(string file, bool debugMode, Optimizati`
`145`	`150`	`if (IsHttpUri(file))`
`146`	`151`	`{`
`147`	`152`	`var downloader = new ScriptDownloader();`
`148`		`- var scriptFile = await downloader.Download(file);`
`149`		`- var exitCode = await RunScript(scriptFile, debugMode, optimizationLevel, args, interactive);`
	`153`	`+ var scriptFile = await downloader.Download(file);`
	`154`	`+ var exitCode = await RunScript(scriptFile, debugMode, optimizationLevel, args, interactive);`
`150`	`155`	`File.Delete(scriptFile);`
`151`	`156`	`return exitCode;`
`152`	`157`	`}`
`@@ -186,10 +191,10 @@ private static async Task RunInteractive(bool debugMode)`
`186`	`191`	`await runner.RunLoop();`
`187`	`192`	`}`
`188`	`193`
`189`		`- private static Task<int> RunCode(string code, bool debugMode, IEnumerable<string> args, string currentWorkingDirectory)`
	`194`	`+ private static Task<int> RunCode(string code, bool debugMode, OptimizationLevel optimizationLevel, IEnumerable<string> args, string currentWorkingDirectory)`
`190`	`195`	`{`
`191`	`196`	`var sourceText = SourceText.From(code);`
`192`		`- var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), args, null, scriptMode: ScriptMode.Eval);`
	`197`	`+ var context = new ScriptContext(sourceText, currentWorkingDirectory ?? Directory.GetCurrentDirectory(), args, null,optimizationLevel, ScriptMode.Eval);`
`193`	`198`	`return Run(debugMode, context);`
`194`	`199`	`}`
`195`	`200`