Skip to content

[release/7.0] source build backports #78395

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

Merged
carlossanlop merged 4 commits into from
Nov 18, 2022
Merged

[release/7.0] source build backports #78395

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcd4e44
Use generated runtime.json when building shared framework packages. (…
tmds Sep 27, 2022
ba6fd5b
source-build: support building runtime using non-portable runtime pac…
tmds Oct 12, 2022
25fc72d
source-build: set the properties to build for mono runtime. (#77786)
tmds Nov 4, 2022
a3dc08c
Pass TargetRid and SourceBuildNonPortable to the native scripts (#74504)
tmds Sep 28, 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
Prev Previous commit
Next Next commit
source-build: support building runtime using non-portable runtime pac… 
…kages. (#75597)

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

Currently source-build performs a 'runtime-portable' build that produces
'linux-{arch}' packages that are used when building target runtime (non-portable).

With this change, we can use the non-portable packages that are produced by
a previous (non-portable) 'runtime' build. This helps eliminate the
'runtime-portable' build.

* Avoid references to Microsoft.AspNetCore.App.<rid>.

* crossgen2: set RuntimeIdentifier explicitly.

* PR feedback

* Revert "crossgen2: set RuntimeIdentifier explicitly."

This reverts commit 10be274.

* PR feedback.

* Revert changes to ILCompiler.csproj.

* Update Directory.Build.targets

Co-authored-by: Viktor Hofer <[email protected]>
  • Loading branch information
@tmds @ViktorHofer
tmds and ViktorHofer committed Nov 15, 2022
commit ba6fd5b7c811787b177adcf8bb363883708b020a
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)'))">
<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" />
</ItemGroup>

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