Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit efa35bd

Browse files
author
Nate McMaster
committed
Ignore failures due to incoherent dependencies on dotnet-runtime
1 parent ec3332d commit efa35bd

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

build/package/Installer.DEB.proj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,24 @@
1616
<Target Name="BuildSdkDeb"
1717
Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(DebuildPresent)' == 'true' "
1818
DependsOnTargets="PrepareDotnetDebDirectories;
19-
PrepareDotnetDebTool;"
19+
PrepareDotnetDebTool;
20+
EvaluateRuntimeCoherence;"
2021
Inputs="@(CLISdkFiles)"
2122
Outputs="$(SdkInstallerFile)" >
2223

24+
<PropertyGroup>
25+
<!-- Ignored for now while the "trampoline" host feature is in progress -->
26+
<AspNetCoreSharedFxArgs> --ignore-depends=aspnetcore-store-2.0.3</AspNetCoreSharedFxArgs>
27+
<!-- Ignored because versions of aspnetcore-runtime may be in incoherent with the version of dotnet-runtime we want to use. -->
28+
<AspNetCoreSharedFxArgs>$(AspNetCoreSharedFxArgs) --ignore-depends=dotnet-runtime-$(AspNetCoreSharedFxBaseRuntimeVersion)</AspNetCoreSharedFxArgs>
29+
</PropertyGroup>
30+
2331
<!-- Install Shared Framework Packages -->
2432
<Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
2533
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
2634
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
2735
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
28-
<Exec Command="sudo dpkg -i $(DownloadedAspNetCoreSharedFxInstallerFile)" />
36+
<Exec Command="sudo dpkg -i $(DownloadedAspNetCoreSharedFxInstallerFile) $(AspNetCoreSharedFxArgs)" />
2937

3038
<!-- Create layout: Binaries -->
3139
<Copy

build/publish/RuntimeCoherence.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<ReadLinesFromFile File="@(File)">
1313
<Output
1414
TaskParameter="Lines"
15-
ItemName="AspNetCoreSharedFxBaseRuntimeVersion"/>
15+
PropertyName="AspNetCoreSharedFxBaseRuntimeVersion"/>
1616
</ReadLinesFromFile>
1717
</Target>
18-
18+
1919
<Target Name="CompareRuntimeVersions">
2020
<PropertyGroup>
2121
<Coherent>false</Coherent>
22-
<Coherent Condition=" '$(MicrosoftNETCoreAppPackageVersion)' == '@(AspNetCoreSharedFxBaseRuntimeVersion)' ">true</Coherent>
22+
<Coherent Condition=" '$(MicrosoftNETCoreAppPackageVersion)' == '$(AspNetCoreSharedFxBaseRuntimeVersion)' ">true</Coherent>
2323
</PropertyGroup>
2424
</Target>
2525
</Project>

0 commit comments

Comments
 (0)