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

Linux-Bionic should build like Android, no rootfs #47739

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Linux-Bionic should build like Android, no rootfs #47739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afe9cb
Linux-Bionic should build like Android, no rootfs
jkoritzinsky Mar 19, 2025
60d5cce
Treat TargetOS and TargetRid as local properties in dotnet/runtime's …
jkoritzinsky Mar 19, 2025
65fd6b5
Merge branch 'main' into no-rootfs-android-bionic
jkoritzinsky Mar 20, 2025
b0c8ae3
Add patch header now that there's a PR
jkoritzinsky Mar 21, 2025
e547360
Add patch for OS
jkoritzinsky Mar 21, 2025
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
3 changes: 0 additions & 3 deletions eng/pipelines/templates/stages/vmr-verticals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ stages:
container:
name: ${{ variables.linuxBionicCrossContainerName }}
image: ${{ variables.linuxBionicCrossContainerImage }}
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: arm64

Expand All @@ -544,7 +543,6 @@ stages:
container:
name: ${{ variables.linuxBionicCrossContainerName }}
image: ${{ variables.linuxBionicCrossContainerImage }}
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: arm

Expand All @@ -558,7 +556,6 @@ stages:
container:
name: ${{ variables.linuxBionicCrossContainerName }}
image: ${{ variables.linuxBionicCrossContainerImage }}
crossRootFs: '/crossrootfs/x64'
targetOS: linux-bionic
targetArchitecture: x64

Expand Down
33 changes: 33 additions & 0 deletions src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 9e230fef55109e2e16716136443d8fd5c83bdfae Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <[email protected]>
Date: Fri, 21 Mar 2025 09:09:52 -0700
Subject: [PATCH] Allow TargetOS and TargetRid to be overridden in
DotNetBuild.props

This is needed to fix the linux-bionic builds in the VMR
Backport: https://github.com/dotnet/runtime/pull/113765
---
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 1631f76ce95..7b88a2177d0 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -1,6 +1,6 @@
<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->

-<Project>
+<Project TreatAsLocalProperty="TargetOS;TargetRid">

<PropertyGroup>
<GitHubRepositoryName>runtime</GitHubRepositoryName>
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 7b88a2177d0deb..5403d38e544465 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -16,6 +16,7 @@
<_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
<TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
<TargetOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetOS>
+ <TargetOS Condition="'$(TargetOS)' == 'win'">windows</TargetOS>

<_hostRidPlatformIndex>$(_hostRid.LastIndexOf('-'))</_hostRidPlatformIndex>
<_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-'))</_hostArch>
Loading