Merge pull request dotnet-script#47 from filipw/feature/valuetuple

filipw · web-flow · commit 5a5826e8af30 · 2017-01-05T11:32:26.000+01:00
added implicit reference to System.ValueTuple
diff --git a/src/Dotnet.Script.Core/ScriptCompiler.cs b/src/Dotnet.Script.Core/ScriptCompiler.cs
@@ -40,7 +40,8 @@ public virtual ScriptOptions CreateScriptOptions(ScriptContext context)
             var opts = ScriptOptions.Default.
                 AddImports(DefaultNamespaces).
                 AddReferences(DefaultAssemblies).
-                WithSourceResolver(new RemoteFileResolver(context.WorkingDirectory));
+                WithSourceResolver(new RemoteFileResolver(context.WorkingDirectory)).
+                WithMetadataResolver(ScriptMetadataResolver.Default);
 
             if (!string.IsNullOrWhiteSpace(context.FilePath))
             {
diff --git a/src/Dotnet.Script.Core/project.json b/src/Dotnet.Script.Core/project.json
@@ -19,7 +19,8 @@
   "dependencies": {
     "NETStandard.Library": "1.6.0",
     "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121",
-    "Microsoft.CodeAnalysis.CSharp.Scripting": "2.0.0-rc2"
+    "Microsoft.CodeAnalysis.CSharp.Scripting": "2.0.0-rc2",
+    "System.ValueTuple": "4.3.0" 
   },
 
   "frameworks": {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ public virtual ScriptOptions CreateScriptOptions(ScriptContext context)`
`40`	`40`	`var opts = ScriptOptions.Default.`
`41`	`41`	`AddImports(DefaultNamespaces).`
`42`	`42`	`AddReferences(DefaultAssemblies).`
`43`		`- WithSourceResolver(new RemoteFileResolver(context.WorkingDirectory));`
	`43`	`+ WithSourceResolver(new RemoteFileResolver(context.WorkingDirectory)).`
	`44`	`+ WithMetadataResolver(ScriptMetadataResolver.Default);`
`44`	`45`
`45`	`46`	`if (!string.IsNullOrWhiteSpace(context.FilePath))`
`46`	`47`	`{`