34 lines
1.9 KiB
Diff
34 lines
1.9 KiB
Diff
From 4f21dd6d62c740e2cc2557bbc5d6c2f2653a5612 Mon Sep 17 00:00:00 2001
|
|
Patch-Source: https://github.com/dotnet/aspnetcore/pull/46735
|
|
From: Antoine Martin <dev@ayakael.net>
|
|
Date: Wed, 9 Mar 2022 08:17:41 +0000
|
|
Subject: [PATCH 1/1] arm build
|
|
|
|
Forgotten backport from https://github.com/dotnet/aspnetcore/pull/43937.
|
|
Without this, aspnetcore does not properly ingest new RIDs generated by runtime
|
|
|
|
---
|
|
diff --git a/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in b/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
|
|
index 5e693b6d7c..500113ea46 100644
|
|
--- a/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
|
|
+++ b/src/aspnetcore/eng/tools/GenerateFiles/Directory.Build.targets.in
|
|
@@ -42,6 +42,18 @@
|
|
<RuntimePackRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
|
|
</KnownFrameworkReference>
|
|
|
|
+ <KnownAppHostPack Update="Microsoft.NETCore.App">
|
|
+ <AppHostPackVersion
|
|
+ Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</AppHostPackVersion>
|
|
+ <AppHostRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
|
|
+ </KnownAppHostPack>
|
|
+
|
|
+ <KnownRuntimePack Update="Microsoft.NETCore.App">
|
|
+ <LatestRuntimeFrameworkVersion
|
|
+ Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</LatestRuntimeFrameworkVersion>
|
|
+ <AppHostRuntimeIdentifiers Condition=" '$(PortableBuild)' == 'false' ">$(TargetRuntimeIdentifier)</AppHostRuntimeIdentifiers>
|
|
+ </KnownRuntimePack>
|
|
+
|
|
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(PortableBuild)' == 'false' ">
|
|
<Crossgen2PackVersion
|
|
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
|
|
|