Skip to content

Commit 0c63beb

Browse files
committed
Merge branch 'hotfix/0.9.2'
* hotfix/0.9.2: (GH-166) Don't add non cil script references
2 parents 3900618 + 5efe976 commit 0c63beb

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/Cake.Scripting/CodeGen/CakeScriptGenerator.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,20 +115,21 @@ public CakeScript Generate(FileChange fileChange)
115115

116116
// Load all references.
117117
_log.Verbose("Adding references...");
118-
var references = new HashSet<FilePath>(
118+
var references = new HashSet<IFile>(
119119
_scriptConventions
120120
.GetDefaultAssemblies(_environment.ApplicationRoot)
121121
.Union(_referenceAssemblyResolver.GetReferenceAssemblies())
122-
.Select(a => FilePath.FromString(a.Location)));
122+
.Select(a => _fileSystem.GetFile(a.Location))
123+
.Where(file => !file.Exists || file.IsClrAssembly()));
123124

124-
references.AddRange(result.References.Select(r => new FilePath(r)));
125+
references.AddRange(result.References.Select(r => _fileSystem.GetFile(r)));
125126

126127
// Find aliases
127128
_log.Verbose("Finding aliases...");
128129
var aliases = new List<CakeScriptAlias>();
129-
foreach (var reference in references.Select(_fileSystem.GetFile))
130+
foreach (var reference in references)
130131
{
131-
if (reference.Exists && reference.IsClrAssembly())
132+
if (reference.Exists)
132133
{
133134
aliases.AddRange(_aliasFinder.FindAliases(reference.Path));
134135
}
@@ -152,7 +153,7 @@ public CakeScript Generate(FileChange fileChange)
152153
GenerateSource(aliases) +
153154
string.Join("\n", result.Lines);
154155
response.Usings.AddRange(namespaces);
155-
response.References.AddRange(references.Select(r => r.FullPath));
156+
response.References.AddRange(references.Select(r => r.Path.FullPath));
156157

157158
// Return the response.
158159
return response;

0 commit comments

Comments
 (0)