-
Notifications
You must be signed in to change notification settings - Fork 132
/
0001-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch
47 lines (40 loc) · 3.03 KB
/
0001-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 13 May 2020 19:46:47 +0000
Subject: [PATCH 01/19] Use non-portable NETCoreAppRuntime for crossgen
---
eng/Dependencies.props | 1 +
.../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index bfc8c66145..311bcdeeda 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -98,6 +98,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-x64" />
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm" />
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.linux-musl-arm64" />
+ <LatestPackageReference Condition="'$(TargetOsName)' != 'osx'" Include="Microsoft.NETCore.App.Runtime.$(SourceBuildRuntimeIdentifier)" Version="5.0.0-preview.8.20407.11" />
</ItemGroup>
<ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
index adc03bf835..5e61db943e 100644
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -104,8 +104,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<!-- Disambiguated RID-specific crossgen executable relative path -->
<CrossgenToolPackagePath Condition=" '$(CrossCompileDirectory)' != '' ">$(CrossCompileDirectory)\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
+ <MicrosoftNETCoreAppRuntimeIdentifier>$(RuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
+ <MicrosoftNETCoreAppRuntimeIdentifier Condition="'$(TargetOsName)' != 'osx'">$(SourceBuildRuntimeIdentifier)</MicrosoftNETCoreAppRuntimeIdentifier>
<!-- E.g. "PkgMicrosoft_NETCore_App_Runtime_win-x64" (set in obj/Microsoft.AspNetCore.App.Runtime.csproj.nuget.g.props). -->
- <RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier)</RuntimePackageRootVariableName>
+ <RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(MicrosoftNETCoreAppRuntimeIdentifier.Replace('.', '_'))</RuntimePackageRootVariableName>
<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
@@ -119,7 +121,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<IncludeAssets>Runtime;Native</IncludeAssets>
</Reference>
- <Reference Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
+ <Reference Include="Microsoft.NETCore.App.Runtime.$(MicrosoftNETCoreAppRuntimeIdentifier)"
ExcludeAssets="All"
PrivateAssets="All"
GeneratePathProperty="true" />