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.

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

[release/7.0] source build backports #78395

Merged
merged 4 commits into from Nov 18, 2022
Merged

Commits on Nov 15, 2022

  1. Use generated runtime.json when building shared framework packages. (#…

    …76068)
    
    * Use generated runtime.json when building shared framework packages.
    
    * Don't UpdateRuntimeJson on Build.
    
    * PR feedback.
    
    * Update Microsoft.NETCore.Platforms.csproj
    
    Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
    tmds and ViktorHofer committed Nov 15, 2022
    Copy the full SHA
    dcd4e44 View commit details
    Browse the repository at this point in the history
  2. 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 <viktor.hofer@microsoft.com>
    tmds and ViktorHofer committed Nov 15, 2022
    Copy the full SHA
    ba6fd5b View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    25fc72d View commit details
    Browse the repository at this point in the history
  4. Pass TargetRid and SourceBuildNonPortable to the native scripts (#74504)

    * Pass SourceBuild TargetRid and SourceBuildPortable args through the native script.
    
    * Rename -packagerid to -distrorid.
    
    * Fix init-distro-rid.sh.
    
    * Use OutputRid instead of PackageRid.
    
    * Drop unnecessary Condition.
    
    * Try passing --distrorid as OutputRid.
    
    * NativeExport: use PackageRID for AppHostRuntimeIdentifier.
    
    * Rename --distrorid to --outputrid.
    
    * Fix SourceBuild.props.
    
    * Undo changes to init-distro-rid.sh.
    
    * Let source-build leg build 'banana-x64' rid.
    
    * SourceBuild.props: don't force a RuntimeOS.
    
    * SourceBuild.props: set AdditionalRuntimeIdentifierParent.
    
    * Build banana.24-x64 instead.
    
    * Fix SourceBuild.props.
    
    * SourceBuild.props: try fix AdditionalRuntimeIdentifier* usage.
    
    * source-build.yml: add runtimeOS parameter.
    
    * SourceBuild.props: derive RuntimeOS from NETCoreSdkRuntimeIdentifier.
    
    * Undo using NETCoreSdkRuntimeIdentifier.
    
    * Update eng/pipelines/common/global-build-job.yml
    
    Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
    
    Co-authored-by: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
    2 people authored and ViktorHofer committed Nov 15, 2022
    Copy the full SHA
    a3dc08c View commit details
    Browse the repository at this point in the history