Skip to content

Commit bc99523

Browse files
committed
Merge branch 'release/0.10.0'
2 parents 0c63beb + af4cbd7 commit bc99523

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

src/Cake.Bakery/Cake.Bakery.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<InternalsVisibleTo Include="Cake.Bakery.Tests" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Cake.Core" Version="2.0.0" />
19-
<PackageReference Include="Cake.NuGet" Version="2.0.0" />
18+
<PackageReference Include="Cake.Core" Version="2.1.0" />
19+
<PackageReference Include="Cake.NuGet" Version="2.1.0" />
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
2121
</ItemGroup>
2222
<ItemGroup>

src/Cake.Scripting.Tests/Cake.Scripting.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@
107107
</ItemGroup>
108108

109109
<ItemGroup>
110-
<PackageReference Include="Cake.Core" Version="2.0.0" />
111-
<PackageReference Include="Cake.Testing" Version="2.0.0" />
110+
<PackageReference Include="Cake.Core" Version="2.1.0" />
111+
<PackageReference Include="Cake.Testing" Version="2.1.0" />
112112
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
113113
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
114114
<PackageReference Include="xunit" Version="2.4.1" />

src/Cake.Scripting/Cake.Scripting.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<InternalsVisibleTo Include="Cake.Scripting.Tests" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="2.0.0" />
16-
<PackageReference Include="Cake.Common" Version="2.0.0" />
15+
<PackageReference Include="Cake.Core" Version="2.1.0" />
16+
<PackageReference Include="Cake.Common" Version="2.1.0" />
1717
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
1818
<PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.2.4" />
1919
</ItemGroup>

src/Cake.Scripting/CodeGen/CakeScriptGenerator.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ public CakeScript Generate(FileChange fileChange)
103103
var addinReferences = _processor.InstallAddins(new[] { addin }, _addinRoot);
104104
foreach (var addinReference in addinReferences)
105105
{
106+
// remove the 'runtimes' dlls
107+
var isInRuntimes = addinReference.Segments
108+
.Skip(_addinRoot.Segments.Length)
109+
.Any(s => s.Equals("runtimes", StringComparison.OrdinalIgnoreCase));
110+
if (isInRuntimes)
111+
{
112+
_log.Verbose($"Ignoring {addinReference.FullPath} as it resides under 'runtimes'.");
113+
continue;
114+
}
115+
106116
result.References.Add(addinReference.FullPath);
107117
}
108118
}

0 commit comments

Comments
 (0)