Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

CompilationDependencyResolver should operate on known list of CSX files #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 12, 2018
Merged

CompilationDependencyResolver should operate on known list of CSX files #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51f11bf
CompilationDependencyResolver should operate on known list of CSX files
filipw Dec 11, 2018
ab86b59
added test
filipw Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions 14 src/Dotnet.Script.DependencyModel/Compilation/CompilationDependencyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,27 @@ private static IRestorer CreateRestorer(LogFactory logFactory)
return new ProfiledRestorer(new DotnetRestorer(commandRunner, logFactory),logFactory);
}

[Obsolete("Please use the overload that takes in a list of script files")]
public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory, bool enableScriptNugetReferences, string defaultTargetFramework = "net46")
{
var pathToProjectFile = _scriptProjectProvider.CreateProject(targetDirectory, defaultTargetFramework,
enableScriptNugetReferences);
return GetDependencies(targetDirectory, null, enableScriptNugetReferences, defaultTargetFramework);
}

public IEnumerable<CompilationDependency> GetDependencies(string targetDirectory, IEnumerable<string> scriptFiles, bool enableScriptNugetReferences, string defaultTargetFramework = "net46")
{
var pathToProjectFile = scriptFiles == null ?
_scriptProjectProvider.CreateProject(targetDirectory, defaultTargetFramework, enableScriptNugetReferences) :
_scriptProjectProvider.CreateProject(targetDirectory, scriptFiles, defaultTargetFramework, enableScriptNugetReferences);

if (pathToProjectFile == null)
{
return Array.Empty<CompilationDependency>();
}

var dependencyInfo = _scriptDependencyInfoProvider.GetDependencyInfo(pathToProjectFile, Array.Empty<string>());

var dependencyContext = dependencyInfo.DependencyContext;

var compilationAssemblyResolvers = GetCompilationAssemblyResolvers(dependencyInfo.NugetPackageFolders);


List<CompilationDependency> result = new List<CompilationDependency>();
var compileLibraries = dependencyContext.CompileLibraries;

Expand Down
13 changes: 11 additions & 2 deletions 13 src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,16 @@ private void LogProjectFileInfo(string pathToProjectFile)

public string CreateProject(string targetDirectory, string defaultTargetFramework = "net46", bool enableNuGetScriptReferences = false)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we mark this as obsolete too?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is actually used by us at runtime so it's needed

{
return CreateProject(targetDirectory, Directory.GetFiles(targetDirectory, "*.csx", SearchOption.AllDirectories), defaultTargetFramework, enableNuGetScriptReferences);
}

public string CreateProject(string targetDirectory, IEnumerable<string> scriptFiles, string defaultTargetFramework = "net46", bool enableNuGetScriptReferences = false)
{
if (scriptFiles == null || !scriptFiles.Any())
{
return null;
}

var pathToProjectFile = Directory.GetFiles(targetDirectory, "*.csproj").FirstOrDefault();
if (pathToProjectFile == null && !enableNuGetScriptReferences)
{
Expand All @@ -82,8 +92,7 @@ public string CreateProject(string targetDirectory, string defaultTargetFramewor

_logger.Debug($"Creating project file for *.csx files found in {targetDirectory} using {defaultTargetFramework} as the default framework.");

var csxFiles = Directory.GetFiles(targetDirectory, "*.csx", SearchOption.AllDirectories);
return SaveProjectFileFromScriptFiles(targetDirectory, defaultTargetFramework, csxFiles);
return SaveProjectFileFromScriptFiles(targetDirectory, defaultTargetFramework, scriptFiles.ToArray());
}

public string CreateProjectForScriptFile(string scriptFile)
Expand Down
25 changes: 22 additions & 3 deletions 25 src/Dotnet.Script.Tests/CompilationDependencyResolverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Dotnet.Script.DependencyModel.Compilation;
using Dotnet.Script.DependencyModel.Environment;
using Dotnet.Script.Shared.Tests;
using System.IO;
using Xunit;
using Xunit.Abstractions;

Expand All @@ -21,25 +22,43 @@ public CompilationDependencyResolverTests(ITestOutputHelper testOutputHelper)
public void ShouldGetCompilationDependenciesForPackageContainingInlineNuGetPackageReference()
{
var resolver = CreateResolver();
var dependencies = resolver.GetDependencies(TestPathUtils.GetPathToTestFixtureFolder("InlineNugetPackage"), true, _scriptEnvironment.TargetFramework);
var targetDirectory = TestPathUtils.GetPathToTestFixtureFolder("InlineNugetPackage");
var csxFiles = Directory.GetFiles(targetDirectory, "*.csx");
var dependencies = resolver.GetDependencies(targetDirectory, csxFiles, true, _scriptEnvironment.TargetFramework);
Assert.Contains(dependencies, d => d.Name == "AutoMapper");
}

[Fact]
public void ShouldGetCompilationDependenciesForPackageContainingInlineNuGetPackageReferenceButSkipExcludedCsx()
{
var resolver = CreateResolver();
var targetDirectory = TestPathUtils.GetPathToTestFixtureFolder("InlineNugetPackageWithFileFiltering");
var csxFiles = Directory.GetFiles(targetDirectory, "InlineNugetPackage.csx");
var dependencies = resolver.GetDependencies(targetDirectory, csxFiles, true, _scriptEnvironment.TargetFramework);
Assert.DoesNotContain(dependencies, d => d.Name == "AutoMapper");
Assert.Contains(dependencies, d => d.Name == "Newtonsoft.Json");
}

[Fact]
public void ShouldGetCompilationDependenciesForPackageContainingNativeLibrary()
{
var resolver = CreateResolver();
var dependencies = resolver.GetDependencies(TestPathUtils.GetPathToTestFixtureFolder("NativeLibrary"), true, _scriptEnvironment.TargetFramework);
var targetDirectory = TestPathUtils.GetPathToTestFixtureFolder("NativeLibrary");
var csxFiles = Directory.GetFiles(targetDirectory, "*.csx");
var dependencies = resolver.GetDependencies(targetDirectory, csxFiles, true, _scriptEnvironment.TargetFramework);
Assert.Contains(dependencies, d => d.Name == "Microsoft.Data.Sqlite");
}

[Fact]
public void ShouldGetCompilationDependenciesForIssue129()
{
var resolver = CreateResolver();
var dependencies = resolver.GetDependencies(TestPathUtils.GetPathToTestFixtureFolder("Issue129"), true, _scriptEnvironment.TargetFramework);
var targetDirectory = TestPathUtils.GetPathToTestFixtureFolder("Issue129");
var csxFiles = Directory.GetFiles(targetDirectory, "*.csx");
var dependencies = resolver.GetDependencies(targetDirectory, csxFiles, true, _scriptEnvironment.TargetFramework);
Assert.Contains(dependencies, d => d.Name == "Auth0.ManagementApi");
}

private CompilationDependencyResolver CreateResolver()
{
var resolver = new CompilationDependencyResolver(TestOutputHelper.CreateTestLogFactory());
Expand Down
4 changes: 4 additions & 0 deletions 4 ...tnet.Script.Tests/TestFixtures/InlineNugetPackageWithFileFiltering/InlineNugetPackage.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#r "nuget:Newtonsoft.Json"

using Newtonsoft.Json;
Console.WriteLine(typeof(JsonConvert));
4 changes: 4 additions & 0 deletions 4 ...ript.Tests/TestFixtures/InlineNugetPackageWithFileFiltering/SkippedInlineNugetPackage.csx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#r "nuget:AutoMapper"

using AutoMapper;
Console.WriteLine(typeof(MapperConfiguration));
Morty Proxy This is a proxified and sanitized view of the page, visit original site.