Merge pull request #591 from filipw/bugfix/compilation-dependency-resolver-5.0

seesharper · web-flow · commit fc98fff643bd · 2020-11-11T15:48:26.000+01:00
fixed CompilationDependencyResolver for .NET 5.0
diff --git a/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs b/src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
@@ -44,10 +44,11 @@ public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory
             }
 
             // On .Net Core, we need to fetch the compilation references for framework assemblies separately.
-            if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase))
+            if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase) ||
+                defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase))
             {
                 var compilationreferences = _compilationReferenceReader.Read(projectFileInfo);
-                result.Add(new CompilationDependency("Microsoft.NETCore.App", "3.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));
+                result.Add(new CompilationDependency("Dotnet.Script.Default.Dependencies", "99.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));
             }
 
             return result;
diff --git a/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs b/src/Dotnet.Script.DependencyModel/Compilation/CompilationReferencesReader.cs
@@ -48,7 +48,7 @@ public IEnumerable<CompilationReference> Read(ProjectFileInfo projectFile)
             {
                 File.Delete(referencePathsFile);
             }
-            var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory}", workingDirectory);
+            var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory} --nologo", workingDirectory);
             if (exitCode != 0)
             {
                 throw new Exception($"Unable to read compilation dependencies for '{projectFile.Path}'. Make sure that all script files contains valid NuGet references");
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,11 @@ public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`// On .Net Core, we need to fetch the compilation references for framework assemblies separately.`
`47`		`- if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase))`
	`47`	`+ if (defaultTargetFramework.StartsWith("netcoreapp3", StringComparison.InvariantCultureIgnoreCase) \|\|`
	`48`	`+ defaultTargetFramework.StartsWith("net5", StringComparison.InvariantCultureIgnoreCase))`
`48`	`49`	`{`
`49`	`50`	`var compilationreferences = _compilationReferenceReader.Read(projectFileInfo);`
`50`		`- result.Add(new CompilationDependency("Microsoft.NETCore.App", "3.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));`
	`51`	`+ result.Add(new CompilationDependency("Dotnet.Script.Default.Dependencies", "99.0", compilationreferences.Select(cr => cr.Path).ToArray(), Array.Empty<string>()));`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public IEnumerable<CompilationReference> Read(ProjectFileInfo projectFile)`
`48`	`48`	`{`
`49`	`49`	`File.Delete(referencePathsFile);`
`50`	`50`	`}`
`51`		`- var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory}", workingDirectory);`
	`51`	`+ var exitCode = _commandRunner.Execute("dotnet", $"build \"{pathToCompilationProjectFile}\" /p:OutputType=Library -o {outputDirectory} --nologo", workingDirectory);`
`52`	`52`	`if (exitCode != 0)`
`53`	`53`	`{`
`54`	`54`	`throw new Exception($"Unable to read compilation dependencies for '{projectFile.Path}'. Make sure that all script files contains valid NuGet references");`