Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

source-build: support building runtime using non-portable runtime packages. #75597

Merged
merged 8 commits into from
Oct 12, 2022
Merged

source-build: support building runtime using non-portable runtime packages. #75597

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a05b18
source-build: support building runtime using non-portable runtime pac…
tmds Sep 14, 2022
73d3229
Avoid references to Microsoft.AspNetCore.App.<rid>.
tmds Sep 15, 2022
10be274
crossgen2: set RuntimeIdentifier explicitly.
tmds Sep 20, 2022
4e5e662
PR feedback
tmds Sep 28, 2022
fee4862
Revert "crossgen2: set RuntimeIdentifier explicitly."
tmds Sep 28, 2022
04b68cb
PR feedback.
tmds Sep 28, 2022
997ded9
Revert changes to ILCompiler.csproj.
tmds Oct 8, 2022
cefa413
Update Directory.Build.targets
ViktorHofer Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,21 @@
<Import Project="$(RepositoryEngineeringDir)generators.targets" />
<Import Project="$(RepositoryEngineeringDir)python.targets" />

<!--
When .NET gets built from source, make the SDK aware there are bootstrap packages
for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
-->
<ItemGroup Condition=" '$(DotNetBuildFromSource)' == 'true' " >
<KnownFrameworkReference Update="@(KnownFrameworkReference->WithMetadataValue('Identity', 'Microsoft.NETCore.App')->WithMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))">
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
<RuntimePackRuntimeIdentifiers>$(PackageRID)</RuntimePackRuntimeIdentifiers>
</KnownFrameworkReference>
<KnownCrossgen2Pack Update="@(KnownCrossgen2Pack->WithMetadataValue('Identity', 'Microsoft.NETCore.App.Crossgen2')->WithMetadataValue('TargetFramework', '$(NetCoreAppCurrent)'))">
<Crossgen2RuntimeIdentifiers>$(PackageRID)</Crossgen2RuntimeIdentifiers>
</KnownCrossgen2Pack>
<!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
<KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
tmds marked this conversation as resolved.
Show resolved Hide resolved
tmds marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<PropertyGroup>
<!--
Define this here (not just in Versions.props) because the SDK resets it
Expand Down