Merge pull request #980 from seesharper/master

Added support for csproj-based scripts

build/Packages.props

@@ -2,7 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <DotnetScriptNuGetMetadataResolver>2.0.3</DotnetScriptNuGetMetadataResolver>
+    <DotnetScriptDependencyModelVersion>0.1.0</DotnetScriptDependencyModelVersion>
+    <DotnetScriptDependencyModelNuGetVersion>0.1.0</DotnetScriptDependencyModelNuGetVersion>    
     <MicrosoftAspNetCoreDiagnosticsVersion>1.1.0</MicrosoftAspNetCoreDiagnosticsVersion>
     <MicrosoftAspNetCoreHostingVersion>1.1.0</MicrosoftAspNetCoreHostingVersion>
     <MicrosoftAspNetCoreHttpFeaturesVersion>1.1.0</MicrosoftAspNetCoreHttpFeaturesVersion>
@@ -25,7 +26,7 @@
     <MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>1.1.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
     <MicrosoftExtensionsConfigurationJsonVersion>1.1.0</MicrosoftExtensionsConfigurationJsonVersion>
     <MicrosoftExtensionsDependencyInjectionVersion>1.1.0</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsDependencyModelVersion>1.1.0</MicrosoftExtensionsDependencyModelVersion>
+    <MicrosoftExtensionsDependencyModelVersion>2.0.0</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsFileProvidersPhysicalVersion>1.1.0</MicrosoftExtensionsFileProvidersPhysicalVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>1.1.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftExtensionsLoggingVersion>1.1.0</MicrosoftExtensionsLoggingVersion>

src/OmniSharp.Script/OmniSharp.Script.csproj

@@ -12,7 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dotnet.Script.NuGetMetadataResolver" Version="$(DotnetScriptNuGetMetadataResolver)" />
+    <PackageReference Include="Dotnet.Script.DependencyModel" Version="$(DotnetScriptDependencyModelVersion)" />
+    <PackageReference Include="Dotnet.Script.DependencyModel.NuGet" Version="$(DotnetScriptDependencyModelNuGetVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisCSharpScriptingVersion)" />
     <PackageReference Include="System.ValueTuple" Version="$(SystemValueTupleVersion)" />
   </ItemGroup>

src/OmniSharp.Script/ScriptHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Dotnet.Script.NuGetMetadataResolver;
+using Dotnet.Script.DependencyModel.NuGet;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Scripting;

src/OmniSharp.Script/ScriptProjectSystem.cs

@@ -5,15 +5,14 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using Dotnet.Script.NuGetMetadataResolver;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.DotNet.ProjectModel;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyModel;
 using Microsoft.Extensions.Logging;
 using OmniSharp.Models.WorkspaceInformation;
 using OmniSharp.Services;
+using Dotnet.Script.DependencyModel.Compilation;
+using LogLevel = Dotnet.Script.DependencyModel.Logging.LogLevel;
 
 namespace OmniSharp.Script
 {   
@@ -31,8 +30,7 @@ public class ScriptProjectSystem : IProjectSystem
         private readonly IOmniSharpEnvironment _env;
         private readonly ILogger _logger;
 
-        private readonly IScriptProjectProvider _scriptProjectProvider;        
-        private static readonly Lazy<string> _targetFrameWork = new Lazy<string>(ResolveTargetFramework);
+        private readonly CompilationDependencyResolver _compilationDependencyResolver;
 
         [ImportingConstructor]
         public ScriptProjectSystem(OmniSharpWorkspace workspace, IOmniSharpEnvironment env, ILoggerFactory loggerFactory, 
@@ -43,7 +41,24 @@ public ScriptProjectSystem(OmniSharpWorkspace workspace, IOmniSharpEnvironment e
             _env = env;
             _logger = loggerFactory.CreateLogger<ScriptProjectSystem>();
             _projects = new Dictionary<string, ProjectInfo>();
-            _scriptProjectProvider = ScriptProjectProvider.Create(loggerFactory);
+
+            _compilationDependencyResolver = new CompilationDependencyResolver(type =>
+            {
+                // Prefix with "OmniSharp" so that we make it through the log filter.
+                var categoryName = $"OmniSharp.Script.{type.FullName}";
+                var dependencyResolverLogger = loggerFactory.CreateLogger(categoryName);
+                return ((level, message) =>
+                {
+                    if (level == LogLevel.Debug)
+                    {
+                        dependencyResolverLogger.LogDebug(message);
+                    }
+                    if (level == LogLevel.Info)
+                    {
+                        dependencyResolverLogger.LogInformation(message);
+                    }
+                });
+            });
         }
 
         public string Key => "Script";
@@ -73,45 +88,31 @@ public void Initalize(IConfiguration configuration)
             // explicitly include System.ValueTuple
             inheritedCompileLibraries.AddRange(DependencyContext.Default.CompileLibraries.Where(x =>
                 x.Name.ToLowerInvariant().StartsWith("system.valuetuple")));
-
-            var runtimeContexts = File.Exists(Path.Combine(_env.TargetDirectory, "project.json")) ? ProjectContext.CreateContextForEachTarget(_env.TargetDirectory) : null;
+
             if (!bool.TryParse(configuration["enableScriptNuGetReferences"], out var enableScriptNuGetReferences))
             {
                 enableScriptNuGetReferences = false;
             }
 
-            if (enableScriptNuGetReferences && (runtimeContexts == null || runtimeContexts.Any() == false))
-            {
-                runtimeContexts = TryCreateRuntimeContextsFromScriptFiles();
-            }
-
-            var runtimeContext = runtimeContexts?.FirstOrDefault();
             var commonReferences = new HashSet<MetadataReference>();
 
-            // if we have no context, then we also have no dependencies
+            var compilationDependencies = TryGetCompilationDependencies(enableScriptNuGetReferences);
+
+            // if we have no compilation dependencies
             // we will assume desktop framework
             // and add default CLR references
             // same applies for having a context that is not a .NET Core app
-            AddDefaultClrMetadataReferences(runtimeContext, commonReferences);
-            if (runtimeContext == null)
+            if (!compilationDependencies.Any())
             {
-                _logger.LogInformation("Unable to find project context for CSX files. Will default to non-context usage (Destkop CLR scripts).");
+                _logger.LogInformation("Unable to find dependency context for CSX files. Will default to non-context usage (Destkop CLR scripts).");
+                AddDefaultClrMetadataReferences(commonReferences);
             }
-            // otherwise we will grab dependencies for the script from the runtime context
             else
             {
-                // assume the first one
-                _logger.LogInformation($"Found script runtime context '{runtimeContext.TargetFramework.Framework}' for '{runtimeContext.ProjectFile.ProjectFilePath}'.");
-
-                var projectExporter = runtimeContext.CreateExporter("Release");
-                var projectDependencies = projectExporter.GetDependencies();
-
-                // let's inject all compilation assemblies needed
-                var compilationAssemblies = projectDependencies.SelectMany(x => x.CompilationAssemblies);
-                foreach (var compilationAssembly in compilationAssemblies)
+                foreach (var compilationAssembly in compilationDependencies)
                 {
-                    _logger.LogDebug("Discovered script compilation assembly reference: " + compilationAssembly.ResolvedPath);
-                    AddMetadataReference(commonReferences, compilationAssembly.ResolvedPath);
+                    _logger.LogDebug("Discovered script compilation assembly reference: " + compilationAssembly);
+                    AddMetadataReference(commonReferences, compilationAssembly);
                 }
             }
 
@@ -144,30 +145,40 @@ public void Initalize(IConfiguration configuration)
             }
         }
 
-        private void AddDefaultClrMetadataReferences(ProjectContext projectContext, HashSet<MetadataReference> commonReferences)
+        private string[] TryGetCompilationDependencies(bool enableScriptNuGetReferences)
         {
-            if (projectContext == null || projectContext.TargetFramework?.Framework != ".NETCoreApp")
+            try
             {
-                var assemblies = new[]
-                {
-                    typeof(object).GetTypeInfo().Assembly,
-                    typeof(Enumerable).GetTypeInfo().Assembly,
-                    typeof(Stack<>).GetTypeInfo().Assembly,
-                    typeof(Lazy<,>).GetTypeInfo().Assembly,
-                    FromName("System.Runtime"),
-                    FromName("mscorlib")
-                };
-
-                var references = assemblies
-                    .Where(a => a != null)
-                    .Select(a => a.Location)
-                    .Distinct()
-                    .Select(l => _metadataFileReferenceCache.GetMetadataReference(l));
-
-                foreach (var reference in references)
-                {
-                    commonReferences.Add(reference);
-                }
+                return _compilationDependencyResolver.GetDependencies(_env.TargetDirectory, enableScriptNuGetReferences).ToArray();
+            }
+            catch (Exception e)
+            {
+                _logger.LogError("Failed to resolve compilation dependencies", e);
+                return Array.Empty<string>();
+            }            
+        }
+
+        private void AddDefaultClrMetadataReferences(HashSet<MetadataReference> commonReferences)
+        {
+            var assemblies = new[]
+            {
+                typeof(object).GetTypeInfo().Assembly,
+                typeof(Enumerable).GetTypeInfo().Assembly,
+                typeof(Stack<>).GetTypeInfo().Assembly,
+                typeof(Lazy<,>).GetTypeInfo().Assembly,
+                FromName("System.Runtime"),
+                FromName("mscorlib")
+            };
+
+            var references = assemblies
+                .Where(a => a != null)
+                .Select(a => a.Location)
+                .Distinct()
+                .Select(l => _metadataFileReferenceCache.GetMetadataReference(l));
+
+            foreach (var reference in references)
+            {
+                commonReferences.Add(reference);
             }
 
             Assembly FromName(string assemblyName)
@@ -183,21 +194,6 @@ Assembly FromName(string assemblyName)
             }
         }
 
-        private IEnumerable<ProjectContext> TryCreateRuntimeContextsFromScriptFiles()
-        {
-            _logger.LogInformation($"Attempting to create runtime context from script files. Default target framework {_targetFrameWork.Value}");
-            try
-            {
-                var scriptProjectInfo = _scriptProjectProvider.CreateProject(_env.TargetDirectory, _targetFrameWork.Value);
-                return ProjectContext.CreateContextForEachTarget(Path.GetDirectoryName(scriptProjectInfo.PathToProjectJson));
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(exception, "Unable to create runtime context from script files.");
-            }
-            return null;
-        }
-
         private void AddMetadataReference(ISet<MetadataReference> referenceCollection, string fileReference)
         {
             if (!File.Exists(fileReference))
@@ -260,13 +256,5 @@ Task<object> IProjectSystem.GetWorkspaceModelAsync(WorkspaceInformationRequest r
             }
             return Task.FromResult<object>(new ScriptContextModelCollection(scriptContextModels));
         }
-
-        private static string ResolveTargetFramework()
-        {
-            return Assembly.GetEntryAssembly().GetCustomAttributes()
-                .OfType<System.Runtime.Versioning.TargetFrameworkAttribute>()
-                .Select(x => x.FrameworkName)
-                .FirstOrDefault();
-        }
     }
-}
+}

tests/app.config

@@ -37,11 +37,11 @@
 
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.0.0"/>
             </dependentAssembly>
 
             <dependentAssembly>