Merge pull request #13909 from directhex/bionic-means-bionic
Add linux-bionic-* known runtime packs
This commit is contained in:
commit
15e1a9aee6
1 changed files with 24 additions and 3 deletions
|
@ -162,8 +162,29 @@
|
||||||
<!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->
|
<!-- In .NET 6 the browser-wasm runtime pack started using the Mono naming pattern -->
|
||||||
<Net60RuntimePackRids Remove="browser-wasm" />
|
<Net60RuntimePackRids Remove="browser-wasm" />
|
||||||
|
|
||||||
<NetCoreAppHostRids Include="@(Net60AppHostRids)" />
|
<Net70AppHostRids Include="
|
||||||
<NetCoreRuntimePackRids Include="@(Net60RuntimePackRids)" />
|
@(Net60AppHostRids);
|
||||||
|
linux-bionic-arm;
|
||||||
|
linux-bionic-arm64;
|
||||||
|
linux-bionic-x64;
|
||||||
|
linux-bionic-x86;
|
||||||
|
"/>
|
||||||
|
|
||||||
|
<Net70RuntimePackRids Include="
|
||||||
|
@(Net60RuntimePackRids);
|
||||||
|
linux-bionic-arm;
|
||||||
|
linux-bionic-arm64;
|
||||||
|
linux-bionic-x64;
|
||||||
|
linux-bionic-x86;
|
||||||
|
" />
|
||||||
|
|
||||||
|
<NetCoreAppHostRids Include="
|
||||||
|
@(Net70AppHostRids);
|
||||||
|
" />
|
||||||
|
|
||||||
|
<NetCoreRuntimePackRids Include="
|
||||||
|
@(Net70RuntimePackRids);
|
||||||
|
" />
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
In source-build, we build the current RID from source, which may be
|
In source-build, we build the current RID from source, which may be
|
||||||
|
@ -480,7 +501,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
TargetFramework="net6.0"
|
TargetFramework="net6.0"
|
||||||
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
|
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
|
||||||
AppHostPackVersion="$(_NET60RuntimePackVersion)"
|
AppHostPackVersion="$(_NET60RuntimePackVersion)"
|
||||||
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
|
AppHostRuntimeIdentifiers="@(Net60AppHostRids, '%3B')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
|
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
|
||||||
|
|
Loading…
Reference in a new issue