manually reset to C#8.0

filipw · filipw · commit 407b47c7d17d · 2019-02-01T12:21:15.000+01:00
diff --git a/src/Dotnet.Script.Core/ScriptCompiler.cs b/src/Dotnet.Script.Core/ScriptCompiler.cs
@@ -34,6 +34,12 @@ static ScriptCompiler()
             {
                 CSharpScript.Create<object>("1", ScriptOptions.Default, typeof(CommandLineScriptGlobals), new InteractiveAssemblyLoader()).RunAsync(new CommandLineScriptGlobals(Console.Out, CSharpObjectFormatter.Instance)).GetAwaiter().GetResult();
             });
+
+            // reset default scripting mode to latest language version to enable C# 8.0 features
+            // this is not needed once Roslyn 3.0 stable ships
+            var csharpScriptCompilerType = typeof(CSharpScript).GetTypeInfo().Assembly.GetType("Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScriptCompiler");
+            var parseOptionsField = csharpScriptCompilerType?.GetField("s_defaultOptions", BindingFlags.Static | BindingFlags.NonPublic);
+            parseOptionsField?.SetValue(null, new CSharpParseOptions(LanguageVersion.CSharp8, kind: SourceCodeKind.Script));
         }
 
         protected virtual IEnumerable<string> ImportedNamespaces => new[]
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -186,6 +186,14 @@ public void ShouldHandleCSharp72()
             Assert.Contains("hi", result.output);
         }
 
+        [Fact]
+        public void ShouldHandleCSharp80()
+        {
+            var result = ScriptTestRunner.Default.ExecuteFixture("CSharp80");
+            Assert.Equal(0, result.exitCode);
+
+        }
+
         [Fact]
         public void ShouldEvaluateCode()
         {
diff --git a/src/Dotnet.Script.Tests/TestFixtures/CSharp80/CSharp80.csx b/src/Dotnet.Script.Tests/TestFixtures/CSharp80/CSharp80.csx
@@ -0,0 +1,5 @@
+﻿// static local functions are C# 8.0 feature
+void Foo()
+{
+    static void Bar() { };
+}

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,12 @@ static ScriptCompiler()`
`34`	`34`	`{`
`35`	`35`	`CSharpScript.Create<object>("1", ScriptOptions.Default, typeof(CommandLineScriptGlobals), new InteractiveAssemblyLoader()).RunAsync(new CommandLineScriptGlobals(Console.Out, CSharpObjectFormatter.Instance)).GetAwaiter().GetResult();`
`36`	`36`	`});`
	`37`	`+`
	`38`	`+ // reset default scripting mode to latest language version to enable C# 8.0 features`
	`39`	`+ // this is not needed once Roslyn 3.0 stable ships`
	`40`	`+ var csharpScriptCompilerType = typeof(CSharpScript).GetTypeInfo().Assembly.GetType("Microsoft.CodeAnalysis.CSharp.Scripting.CSharpScriptCompiler");`
	`41`	`+ var parseOptionsField = csharpScriptCompilerType?.GetField("s_defaultOptions", BindingFlags.Static \| BindingFlags.NonPublic);`
	`42`	`+ parseOptionsField?.SetValue(null, new CSharpParseOptions(LanguageVersion.CSharp8, kind: SourceCodeKind.Script));`
`37`	`43`	`}`
`38`	`44`
`39`	`45`	`protected virtual IEnumerable<string> ImportedNamespaces => new[]`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,14 @@ public void ShouldHandleCSharp72()`
`186`	`186`	`Assert.Contains("hi", result.output);`
`187`	`187`	`}`
`188`	`188`
	`189`	`+ [Fact]`
	`190`	`+ public void ShouldHandleCSharp80()`
	`191`	`+ {`
	`192`	`+ var result = ScriptTestRunner.Default.ExecuteFixture("CSharp80");`
	`193`	`+ Assert.Equal(0, result.exitCode);`
	`194`	`+`
	`195`	`+ }`
	`196`	`+`
`189`	`197`	`[Fact]`
`190`	`198`	`public void ShouldEvaluateCode()`
`191`	`199`	`{`