Remove app host prebuilt from aspnetcore

patches/aspnetcore/0009-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch

@@ -16,7 +16,7 @@ index 2e11857..2456577 100644
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
      <LatestPackageReference Include="microsoft.netcore.app.runtime.linux-musl-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
-+    <LatestPackageReference Condition="'$(TargetOsName)' != 'osx'" Include="microsoft.netcore.app.runtime.$(AppHostRuntimeIdentifier)" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
++    <LatestPackageReference Condition="'$(TargetOsName)' != 'osx'" Include="microsoft.netcore.app.runtime.$(SourceBuildRuntimeIdentifier)" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
    </ItemGroup>
 
    <ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
@@ -30,7 +30,7 @@ index 9b6fe29..e4717cf 100644
 
 -    <RuntimePackageRoot>$([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(RuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)'))</RuntimePackageRoot>
 +    <MicrosoftNETCoreAppRuntimeIdentifier>$(RuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
-+    <MicrosoftNETCoreAppRuntimeIdentifier Condition="'$(TargetOsName)' != 'osx'">$(AppHostRuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
++    <MicrosoftNETCoreAppRuntimeIdentifier Condition="'$(TargetOsName)' != 'osx'">$(SourceBuildRuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
 +    <RuntimePackageRoot>$([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'microsoft.netcore.app.runtime.$(MicrosoftNETCoreAppRuntimeIdentifier)', '$(MicrosoftNETCoreAppRuntimeVersion)'))</RuntimePackageRoot>
      <RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
      <CrossgenToolPath>$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))</CrossgenToolPath>

patches/aspnetcore/0010-Conditionally-set-PackAsToolShimRID.patch

@@ -0,0 +1,25 @@
+From f104432d0ed2d09759e6976e6fe773e4bfabd7ce Mon Sep 17 00:00:00 2001
+From: dseefeld <[email protected]>
+Date: Thu, 31 Oct 2019 20:38:26 +0000
+Subject: [PATCH] Conditionally set PackAsToolShimRID
+
+---
+ Directory.Build.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Directory.Build.targets b/Directory.Build.targets
+index c31b6f6..2b92c4b 100644
+--- a/Directory.Build.targets
++++ b/Directory.Build.targets
+@@ -46,7 +46,7 @@
+     <SuppressDependenciesWhenPacking Condition="'$(SuppressDependenciesWhenPacking)' == '' AND '$(IsAnalyzersProject)' == 'true'">true</SuppressDependenciesWhenPacking>
+   </PropertyGroup>
+
+-  <PropertyGroup Condition="'$(PackAsTool)' == 'true' AND '$(IsShippingPackage)' == 'true'">
++  <PropertyGroup Condition="'$(PackAsTool)' == 'true' AND '$(IsShippingPackage)' == 'true' AND '$(DotNetBuildFromSource)' != 'true'">
+     <!-- This is a requirement for Microsoft tool packages only. -->
+     <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
+   </PropertyGroup>
+-- 
+1.8.3.1
+

repos/aspnetcore.proj

@@ -12,7 +12,8 @@
     <BuildCommandArgs>$(BuildCommandArgs) --ci</BuildCommandArgs>
     <BuildCommandArgs>$(BuildCommandArgs) -bl</BuildCommandArgs>
     <BuildCommandArgs>$(BuildCommandArgs) /p:BuildNodeJs=false</BuildCommandArgs>
-    <BuildCommandArgs>$(BuildCommandArgs) /p:AppHostRuntimeIdentifier=$(TargetRid)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildRuntimeIdentifier=$(TargetRid)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:UseAppHost=false</BuildCommandArgs>
 
     <LogVerbosityOptOut>true</LogVerbosityOptOut>
     <BuildCommandArgs>$(BuildCommandArgs) -v $(LogVerbosity)</BuildCommandArgs>

tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/UsageReport/UsageData.cs

@@ -40,16 +40,16 @@ public class UsageData
         {
             CreatedByRid = xml.Element(nameof(CreatedByRid))
                 ?.Value,
-            ProjectDirectories = xml.Element(nameof(ProjectDirectories))
-                ?.Elements()
+            ProjectDirectories = xml.Element(nameof(ProjectDirectories)) == null ? new string[] { } :
+                xml.Element(nameof(ProjectDirectories)).Elements()
                 .Select(x => x.Value)
                 .ToArray(),
-            NeverRestoredTarballPrebuilts = xml.Element(nameof(NeverRestoredTarballPrebuilts))
-                ?.Elements()
+            NeverRestoredTarballPrebuilts = xml.Element(nameof(NeverRestoredTarballPrebuilts)) == null ? new PackageIdentity[] { } :
+                xml.Element(nameof(NeverRestoredTarballPrebuilts)).Elements()
                 .Select(XmlParsingHelpers.ParsePackageIdentity)
                 .ToArray(),
-            Usages = xml.Element(nameof(Usages))
-                ?.Elements()
+            Usages = xml.Element(nameof(Usages)) == null ? new Usage[] { } :
+                xml.Element(nameof(Usages)).Elements()
                 .Select(Usage.Parse)
                 .ToArray()
         };