Merge pull request #62 from LokiMidgard/master

Added Assembly Resolve
AArnott · May 10, 2018 · ed4512d · ed4512d
2 parents 078476a + 9f35314
commit ed4512d
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 14 deletions.
diff --git a/src/CodeGeneration.Roslyn.Tests.Generators/CodeGeneration.Roslyn.Tests.Generators.csproj b/src/CodeGeneration.Roslyn.Tests.Generators/CodeGeneration.Roslyn.Tests.Generators.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
   </PropertyGroup>
 

diff --git a/src/CodeGeneration.Roslyn/CodeGeneration.Roslyn.csproj b/src/CodeGeneration.Roslyn/CodeGeneration.Roslyn.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\opensource.snk</AssemblyOriginatorKeyFile>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.2.0" />
     <PackageReference Include="Validation" Version="2.4.13" />

diff --git a/src/CodeGeneration.Roslyn/CompilationGenerator.cs b/src/CodeGeneration.Roslyn/CompilationGenerator.cs
@@ -7,6 +7,8 @@ namespace CodeGeneration.Roslyn
     using Microsoft.CodeAnalysis.CSharp;
     using Microsoft.CodeAnalysis.CSharp.Syntax;
     using Microsoft.CodeAnalysis.Text;
+    using Microsoft.Extensions.DependencyModel;
+    using Microsoft.Extensions.DependencyModel.Resolution;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
@@ -29,6 +31,10 @@ public class CompilationGenerator
         private readonly List<string> generatedFiles = new List<string>();
         private readonly List<string> additionalWrittenFiles = new List<string>();
         private readonly List<string> loadedAssemblies = new List<string>();
+        private readonly Dictionary<string, Assembly> assembliesByPath = new Dictionary<string, Assembly>();
+        private readonly HashSet<string> directoriesWithResolver = new HashSet<string>();
+        private CompositeCompilationAssemblyResolver assemblyResolver;
+        private DependencyContext dependencyContext;
 
         /// <summary>
         /// Gets or sets the list of paths of files to be compiled.
@@ -67,6 +73,19 @@ public class CompilationGenerator
 
         public string ProjectDirectory { get; set; }
 
+        public CompilationGenerator()
+        {
+            this.assemblyResolver = new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]
+            {
+                new ReferenceAssemblyPathResolver(),
+                new PackageCompilationAssemblyResolver()
+            });
+            this.dependencyContext = DependencyContext.Default;
+
+            var loadContext = AssemblyLoadContext.GetLoadContext(this.GetType().GetTypeInfo().Assembly);
+            loadContext.Resolving += this.ResolveAssembly;
+        }
+
         public void Generate(IProgress<Diagnostic> progress = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             Verify.Operation(this.Compile != null, $"{nameof(Compile)} must be set first.");
@@ -159,8 +178,45 @@ public class CompilationGenerator
 
         protected virtual Assembly LoadAssembly(string path)
         {
+            if (this.assembliesByPath.ContainsKey(path))
+                return this.assembliesByPath[path];
+
             var loadContext = AssemblyLoadContext.GetLoadContext(this.GetType().GetTypeInfo().Assembly);
-            return loadContext.LoadFromAssemblyPath(path);
+            var assembly = loadContext.LoadFromAssemblyPath(path);
+
+            this.dependencyContext = this.dependencyContext.Merge(DependencyContext.Load(assembly));
+            var basePath = Path.GetDirectoryName(path);
+            if (!this.directoriesWithResolver.Contains(basePath))
+            {
+                this.assemblyResolver = new CompositeCompilationAssemblyResolver(new ICompilationAssemblyResolver[]
+                {
+                    new AppBaseCompilationAssemblyResolver(basePath),
+                    this.assemblyResolver
+                });
+            }
+
+            this.assembliesByPath.Add(path, assembly);
+            return assembly;
+        }
+
+        private Assembly ResolveAssembly(AssemblyLoadContext context, AssemblyName name)
+        {
+            var library = this.dependencyContext.RuntimeLibraries.FirstOrDefault(runtime => string.Equals(runtime.Name, name.Name, StringComparison.OrdinalIgnoreCase));
+            if (library == null)
+                return null;
+            var wrapper = new CompilationLibrary(
+                library.Type,
+                library.Name,
+                library.Version,
+                library.Hash,
+                library.RuntimeAssemblyGroups.SelectMany(g => g.AssetPaths),
+                library.Dependencies,
+                library.Serviceable);
+
+            var assemblyPathes = new List<string>();
+            this.assemblyResolver.TryResolveAssemblyPaths(wrapper, assemblyPathes);
+
+            return assemblyPathes.Select(context.LoadFromAssemblyPath).FirstOrDefault();
         }
 
         private static DateTime GetLastModifiedAssemblyTime(string assemblyListPath)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -11,8 +11,7 @@
     <RepositoryUrl>https://github.com/aarnott/CodeGeneration.Roslyn</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <IsPackable Condition=" $(MSBuildProjectName.Contains('Test')) ">false</IsPackable>
-
-    <NerdbankGitVersioningVersion>1.6.25</NerdbankGitVersioningVersion>
+    <NerdbankGitVersioningVersion>2.1.23</NerdbankGitVersioningVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,13 +25,4 @@
       <PackageLicenseUrl>https://raw.githubusercontent.com/AArnott/CodeGeneration.Roslyn/$(GitCommitIdShort)/LICENSE.txt</PackageLicenseUrl>
     </PropertyGroup>
   </Target>
-
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' == 'true' ">
-    <Import Project="$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets"
-            Condition="Exists('$(UserProfile)\.nuget\packages\nerdbank.gitversioning\$(NerdbankGitVersioningVersion)\buildCrossTargeting\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Target Name="FixUpVersion"
-      BeforeTargets="_GenerateRestoreProjectSpec"
-      DependsOnTargets="GetBuildVersion"
-      Condition=" '$(NerdbankGitVersioningTasksPath)' != '' " />
 </Project>