Merge pull request #410 from filipw/feature/roslyn-3.0.0-beta2

seesharper · web-flow · commit acd312d3f789 · 2019-02-01T13:41:36.000+01:00
Updated to Roslyn 3.0.0 beta2 (C# 8)
diff --git a/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj b/src/Dotnet.Script.Core/Dotnet.Script.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A cross platform library allowing you to run C# (CSX) scripts with support for debugging and inline NuGet packages. Based on Roslyn.</Description>
-    <VersionPrefix>0.29.0</VersionPrefix>
+    <VersionPrefix>0.29.0-beta1</VersionPrefix>
     <Authors>filipw</Authors>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Dotnet.Script.Core</AssemblyName>
@@ -33,9 +33,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0-beta2-final" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="ReadLine" Version="2.0.1" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
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.Core/Versioning/VersionProvider.cs b/src/Dotnet.Script.Core/Versioning/VersionProvider.cs
@@ -43,7 +43,6 @@ VersionInfo ParseTagName(string json)
         public VersionInfo GetCurrentVersion()
         {
             var versionAttribute = typeof(VersionProvider).Assembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().Single();
-            var version = Version.Parse(versionAttribute.InformationalVersion);
             return new VersionInfo(versionAttribute.InformationalVersion, isResolved:true);
         }
     }
diff --git a/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj b/src/Dotnet.Script.DependencyModel.Nuget/Dotnet.Script.DependencyModel.NuGet.csproj
@@ -8,12 +8,12 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;nuget</PackageTags>
-    <Version>0.7.1</Version>
+    <Version>0.8.0-beta1</Version>
     <Description>A MetadataReferenceResolver that allows inline nuget references to be specified in script(csx) files.</Description>
     <Authors>dotnet-script</Authors>
     <Company>dotnet-script</Company>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0-beta2-final" />
    </ItemGroup>
 </Project>
diff --git a/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj b/src/Dotnet.Script.Extras/Dotnet.Script.Extras.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.0.0-beta2-final" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
   </ItemGroup>
 
diff --git a/src/Dotnet.Script.Tests/EnvironmentTests.cs b/src/Dotnet.Script.Tests/EnvironmentTests.cs
@@ -17,7 +17,8 @@ public void ShouldPrintVersionNumber(string versionFlag)
             var result = ScriptTestRunner.Default.Execute(versionFlag);
             Assert.Equal(0, result.exitCode);
             // TODO test that version appears on first line of output!
-            Assert.Matches(@"^[0-9]+(\.[0-9]+){2}$", result.output);
+            // semver regex from https://github.com/semver/semver/issues/232#issue-48635632
+            Assert.Matches(@"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$", result.output);
         }
 
         [Fact]
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() { };
+}
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Dotnet CLI tool allowing you to run C# (CSX) scripts.</Description>
-        <VersionPrefix>0.29.0</VersionPrefix>
+        <VersionPrefix>0.29.0-beta1</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
         <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -22,7 +22,7 @@
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.10.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0-beta2-final" />
         <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     </ItemGroup>

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
`@@ -43,7 +43,6 @@ VersionInfo ParseTagName(string json)`
`43`	`43`	`public VersionInfo GetCurrentVersion()`
`44`	`44`	`{`
`45`	`45`	`var versionAttribute = typeof(VersionProvider).Assembly.GetCustomAttributes<AssemblyInformationalVersionAttribute>().Single();`
`46`		`- var version = Version.Parse(versionAttribute.InformationalVersion);`
`47`	`46`	`return new VersionInfo(versionAttribute.InformationalVersion, isResolved:true);`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ public void ShouldPrintVersionNumber(string versionFlag)`
`17`	`17`	`var result = ScriptTestRunner.Default.Execute(versionFlag);`
`18`	`18`	`Assert.Equal(0, result.exitCode);`
`19`	`19`	`// TODO test that version appears on first line of output!`
`20`		`- Assert.Matches(@"^[0-9]+(\.[0-9]+){2}$", result.output);`
	`20`	`+ // semver regex from https://github.com/semver/semver/issues/232#issue-48635632`
	`21`	`+ Assert.Matches(@"^(0\|[1-9]\d)\.(0\|[1-9]\d)\.(0\|[1-9]\d)(-(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])(\.(0\|[1-9]\d\|\d[a-zA-Z-][0-9a-zA-Z-])))?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$", result.output);`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`[Fact]`
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`	`{`