From efa35bd31a2b0a074777d2e32084107828c2975b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 9 Jan 2018 13:27:50 -0800
Subject: [PATCH] Ignore failures due to incoherent dependencies on
 dotnet-runtime

---
 build/package/Installer.DEB.proj       | 12 ++++++++++--
 build/publish/RuntimeCoherence.targets |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index bbf688f06..8c242d3a9 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -16,16 +16,24 @@
   <Target Name="BuildSdkDeb"
       Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(DebuildPresent)'  == 'true' "
       DependsOnTargets="PrepareDotnetDebDirectories;
-                        PrepareDotnetDebTool;"
+                        PrepareDotnetDebTool;
+                        EvaluateRuntimeCoherence;"
       Inputs="@(CLISdkFiles)"
       Outputs="$(SdkInstallerFile)" >
 
+      <PropertyGroup>
+        <!-- Ignored for now while the "trampoline" host feature is in progress -->
+        <AspNetCoreSharedFxArgs> --ignore-depends=aspnetcore-store-2.0.3</AspNetCoreSharedFxArgs>
+        <!-- Ignored because versions of aspnetcore-runtime may be in incoherent with the version of dotnet-runtime we want to use. -->
+        <AspNetCoreSharedFxArgs>$(AspNetCoreSharedFxArgs) --ignore-depends=dotnet-runtime-$(AspNetCoreSharedFxBaseRuntimeVersion)</AspNetCoreSharedFxArgs>
+      </PropertyGroup>
+
       <!-- Install Shared Framework Packages -->
       <Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
-      <Exec Command="sudo dpkg -i $(DownloadedAspNetCoreSharedFxInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedAspNetCoreSharedFxInstallerFile) $(AspNetCoreSharedFxArgs)" />
 
       <!-- Create layout: Binaries -->
       <Copy
diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets
index 19df0db99..474c20656 100644
--- a/build/publish/RuntimeCoherence.targets
+++ b/build/publish/RuntimeCoherence.targets
@@ -12,14 +12,14 @@
     <ReadLinesFromFile File="@(File)">
       <Output
           TaskParameter="Lines"
-          ItemName="AspNetCoreSharedFxBaseRuntimeVersion"/>
+          PropertyName="AspNetCoreSharedFxBaseRuntimeVersion"/>
     </ReadLinesFromFile>
   </Target>
-  
+
   <Target Name="CompareRuntimeVersions">
     <PropertyGroup>
       <Coherent>false</Coherent>
-      <Coherent Condition=" '$(MicrosoftNETCoreAppPackageVersion)' == '@(AspNetCoreSharedFxBaseRuntimeVersion)' ">true</Coherent>
+      <Coherent Condition=" '$(MicrosoftNETCoreAppPackageVersion)' == '$(AspNetCoreSharedFxBaseRuntimeVersion)' ">true</Coherent>
     </PropertyGroup>
   </Target>
 </Project>