Make target OS/arch in Bundler and TargetInfo non-optional by Copilot · Pull Request #126437 · dotnet/runtime

Copilot · 2026-04-01T23:24:49Z

This pull request refactors how the target operating system and architecture are handled in the bundling logic, making both parameters required rather than optional. It removes fallback logic that previously inferred these values from the current runtime environment, leading to more explicit and predictable behavior. The changes also update tests and utilities to accommodate this new requirement.

Bundler and TargetInfo API changes:

The Bundler and TargetInfo constructors now require explicit OSPlatform and Architecture arguments, removing support for optional values and fallback to the host environment. [1] [2]
The static fallback logic (HostOS) in TargetInfo is removed, so the OS must always be specified.

Test and utility updates:

Test code in BundlerConsistencyTests and SingleFileTestApp is updated to pass the required OSPlatform and Architecture values, using a new Binaries.CurrentOSPlatform helper and RuntimeInformation.OSArchitecture. [1] [2] [3]
A new static property, CurrentOSPlatform, is added to the Binaries utility class to encapsulate platform detection logic for tests.

Resolves #101548

cc @dotnet/appmodel @AaronRobinsonMSFT

…ed OS/arch detection Add a new optional `runtimeIdentifier` parameter to both the `TargetInfo` and `Bundler` constructors. When provided, the runtime identifier string (e.g., "linux-x64", "win-arm64") is parsed to determine the target OS and architecture, eliminating the need for callers to implement their own RID parsing logic. Explicit `os` and `arch` parameters take precedence over RID-derived values. When neither the RID nor explicit parameters are provided, existing behavior (defaulting to the current OS/arch) is preserved. Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/080a2b19-6edb-49cd-aa57-3169ae7c998c Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

…iscV64 extension The NETFRAMEWORK Architecture extension already provides LoongArch64, so the #if !NETFRAMEWORK guard was incorrectly excluding it from RID parsing on .NET Framework. Add RiscV64 extension for NETFRAMEWORK parity and remove the conditional compilation from ParseRuntimeIdentifier. Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/080a2b19-6edb-49cd-aa57-3169ae7c998c Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Make the OS and architecture parameters required (non-nullable) in both the TargetInfo and Bundler constructors, removing the previous approach of adding a runtimeIdentifier parameter. - TargetInfo: os and arch are now required positional parameters - Bundler: targetOS and targetArch are now required positional parameters (3rd and 4th, after hostName and outputDir) - Remove ParseRuntimeIdentifier method and HostOS fallback detection - Update all test callers to pass explicit OS/arch values - Keep #nullable enable, RiscV64/LoongArch64 extensions, Version? nullability Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/181f3158-29d6-449a-b597-e998407a7c29 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

… non-optional Restore the original parameter order (options, targetOS, targetArch) and make all three required. This avoids changing the parameter order which would be more disruptive to callers. Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/181f3158-29d6-449a-b597-e998407a7c29 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

…ameworkVersion non-optional - Add Binaries.CurrentOSPlatform matching the original _hostOS logic (Linux → OSX → FreeBSD → Windows fallback) - Use shared property in both BundlerConsistencyTests and SingleFileTestApp - Make targetFrameworkVersion non-optional on both TargetInfo and Bundler - All callers now pass explicit version (Environment.Version as default) Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/fb0ea73a-20ee-458f-ad6f-9362fdbdb6c7 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

…getInfo Restore the ?? Environment.Version fallback for FrameworkVersion and remove the #nullable enable directive that was added. Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/111adf2b-fa15-47e9-9942-56791bd4bfe9 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

dotnet-policy-service · 2026-04-03T18:58:40Z

Tagging subscribers to this area: @agocke, @elinor-fung
See info in area-owners.md if you want to be subscribed.

Copilot

Pull request overview

Refactors HostModel bundling APIs to require explicit target OS and architecture, removing implicit host-detection defaults and updating installer tests/utilities accordingly. Also introduces RiscV64 handling for Architecture when building under .NET Framework.

Changes:

Make Bundler and TargetInfo require non-optional OSPlatform and Architecture inputs.
Update installer test helpers and test cases to pass explicit OS/arch (via Binaries.CurrentOSPlatform and RuntimeInformation.OSArchitecture).
Add Architecture.RiscV64 shim for NETFRAMEWORK builds.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
`src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs`	Updates constructor signature to require explicit target OS/arch and framework version.
`src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs`	Removes nullable OS/arch inputs and internal host OS inference; adds `RiscV64` for `NETFRAMEWORK`.
`src/installer/tests/TestUtils/Binaries.cs`	Adds `CurrentOSPlatform` helper for tests to pass explicit target OS into bundling APIs.
`src/installer/tests/TestUtils/SingleFileTestApp.cs`	Updates bundling helper to pass explicit OS/arch/version into `Bundler`.
`src/installer/tests/Microsoft.NET.HostModel.Tests/Bundle/BundlerConsistencyTests.cs`	Updates bundler construction in tests to provide explicit OS/arch/version.

src/installer/tests/TestUtils/Binaries.cs

…getInfo.HostOS logic Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/f527b3fb-f65c-493a-bea9-97971e127876 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a3713efd-dc6a-415b-bdde-9d5c860f6ba2 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

…e dead Illumos extension Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/f8b8e2af-d4e9-44c9-a9c7-e5c4128933ed Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

AaronRobinsonMSFT · 2026-04-07T01:57:10Z

@elinor-fung I assume this requires some update to the SDK or were we never relying on the default behavior?

elinor-fung · 2026-04-07T02:14:59Z

We were never relying on the default behaviour. Usage in the SDK always passes these parameters: https://github.com/dotnet/sdk/blob/96683a0ad81c5694820f7824342a4ca5079bdd64/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs#L81-L89

I had that in the PR description previously, but forgot to add it back after CCA wrote over it...

elinor-fung · 2026-04-07T15:22:49Z

/ba-g the legs build analysis indicates it is waiting on all show as completed and green

am11 · 2026-04-07T17:54:38Z

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs

-#if NETFRAMEWORK
            public static OSPlatform FreeBSD => OSPlatform.Create("FREEBSD");
-#endif
-            public static OSPlatform Illumos => OSPlatform.Create("ILLUMOS");


Both freebsd and illumos were used once. Usage of both were removed but kept definition of one?

@copilot Create a new PR to remove FreeBSD and the OSPlatform extension here.

@elinor-fung

Per #126437 (comment), the `FreeBSD` `OSPlatform` extension in `PlatformExtensions` was defined but never used after PR #126437 removed its only usage. This PR removes the unused `extension(OSPlatform)` block while keeping the still-used `extension(Architecture)` block for `LoongArch64`. cc @elinor-fung @am11 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

…6437) This pull request refactors how the target operating system and architecture are handled in the bundling logic, making both parameters required rather than optional. It removes fallback logic that previously inferred these values from the current runtime environment, leading to more explicit and predictable behavior. **Bundler and TargetInfo API changes:** * The `Bundler` and `TargetInfo` constructors now require explicit `OSPlatform` and `Architecture` arguments, removing support for optional values and fallback to the host environment. * The static fallback logic (`HostOS`) in `TargetInfo` is removed, so the OS must always be specified. * Usage in the SDK always passes these parameters **Test and utility updates:** * Test code in `BundlerConsistencyTests` and `SingleFileTestApp` is updated to pass the required `OSPlatform` and `Architecture` values, using a new `Binaries.CurrentOSPlatform` helper and `RuntimeInformation.OSArchitecture`. * A new static property, `CurrentOSPlatform`, is added to the `Binaries` utility class to encapsulate platform detection logic for tests. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

@elinor-fung

…#126612) Per dotnet#126437 (comment), the `FreeBSD` `OSPlatform` extension in `PlatformExtensions` was defined but never used after PR dotnet#126437 removed its only usage. This PR removes the unused `extension(OSPlatform)` block while keeping the still-used `extension(Architecture)` block for `LoongArch64`. cc @elinor-fung @am11 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Initial plan

b7874d1

Copilot AI assigned Copilot and elinor-fung Apr 1, 2026

github-project-automation bot added this to AppModel Apr 1, 2026

Copilot started work on behalf of elinor-fung April 1, 2026 23:24 View session

Copilot AI linked an issue Apr 1, 2026 that may be closed by this pull request

OS/arch optional arguments in Bundler and TargetInfo #101548

Closed

github-actions bot added the area-Infrastructure label Apr 1, 2026

github-project-automation bot added this to Runtime Infra Apr 1, 2026

Copilot AI and others added 2 commits April 2, 2026 00:06

Copilot AI changed the title ~~[WIP] Remove optional OS/arch arguments in Bundler and TargetInfo~~ Add runtimeIdentifier parameter to Bundler and TargetInfo for RID-based OS/arch detection Apr 2, 2026

Copilot finished work on behalf of elinor-fung April 2, 2026 00:13

Copilot AI requested a review from elinor-fung April 2, 2026 00:13

Copilot started work on behalf of elinor-fung April 2, 2026 00:18 View session

Copilot AI and others added 2 commits April 2, 2026 00:35

Copilot finished work on behalf of elinor-fung April 2, 2026 00:42

Copilot started work on behalf of elinor-fung April 2, 2026 18:21 View session

Copilot finished work on behalf of elinor-fung April 2, 2026 18:47

Copilot started work on behalf of elinor-fung April 2, 2026 21:41 View session

Copilot finished work on behalf of elinor-fung April 2, 2026 21:56

elinor-fung changed the title ~~Add runtimeIdentifier parameter to Bundler and TargetInfo for RID-based OS/arch detection~~ Make target OS/arch in Bundler and TargetInfo non-optional Apr 3, 2026

elinor-fung marked this pull request as ready for review April 3, 2026 18:57

Copilot AI review requested due to automatic review settings April 3, 2026 18:57

elinor-fung added area-HostModel and removed area-Infrastructure labels Apr 3, 2026

Copilot started reviewing on behalf of elinor-fung April 3, 2026 18:58 View session

Copilot AI reviewed Apr 3, 2026

View reviewed changes

src/installer/tests/TestUtils/Binaries.cs Show resolved Hide resolved

Copilot started work on behalf of elinor-fung April 3, 2026 19:06 View session

Add Illumos check to Binaries.CurrentOSPlatform to match original Tar…

96ccd4d

…getInfo.HostOS logic Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/f527b3fb-f65c-493a-bea9-97971e127876 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Copilot finished work on behalf of elinor-fung April 3, 2026 19:23

Copilot started work on behalf of elinor-fung April 3, 2026 22:02 View session

Undo RiscV64 addition and inline illumos platform creation

8d57377

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/a3713efd-dc6a-415b-bdde-9d5c860f6ba2 Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Copilot finished work on behalf of elinor-fung April 3, 2026 22:15

Copilot started work on behalf of elinor-fung April 3, 2026 22:57 View session

Copilot finished work on behalf of elinor-fung April 3, 2026 23:07

Copilot started work on behalf of elinor-fung April 4, 2026 03:34 View session

Remove optional OS/arch parameters from Bundler and TargetInfo; remov…

0c41b72

…e dead Illumos extension Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/f8b8e2af-d4e9-44c9-a9c7-e5c4128933ed Co-authored-by: elinor-fung <47805090+elinor-fung@users.noreply.github.com>

Copilot finished work on behalf of elinor-fung April 4, 2026 04:13

AaronRobinsonMSFT approved these changes Apr 7, 2026

View reviewed changes

elinor-fung merged commit bfb2e88 into main Apr 7, 2026
87 checks passed

elinor-fung deleted the copilot/remove-optional-os-arch-args branch April 7, 2026 17:07

github-project-automation bot moved this to Done in Runtime Infra Apr 7, 2026

github-project-automation bot moved this to Done in AppModel Apr 7, 2026

am11 reviewed Apr 7, 2026

View reviewed changes

Copilot AI mentioned this pull request Apr 7, 2026

Remove unused FreeBSD OSPlatform extension from TargetInfo.cs #126612

Merged

dotnet-maestro bot mentioned this pull request Apr 8, 2026

[main] Source code updates from dotnet/runtime dotnet/dotnet#5926

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make target OS/arch in Bundler and TargetInfo non-optional#126437

Make target OS/arch in Bundler and TargetInfo non-optional#126437
elinor-fung merged 10 commits intomainfrom
copilot/remove-optional-os-arch-args

Copilot AI commented Apr 1, 2026 •

edited by elinor-fung

Loading

Uh oh!

dotnet-policy-service bot commented Apr 3, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

AaronRobinsonMSFT commented Apr 7, 2026

Uh oh!

elinor-fung commented Apr 7, 2026

Uh oh!

elinor-fung commented Apr 7, 2026

Uh oh!

Uh oh!

am11 Apr 7, 2026

Uh oh!

elinor-fung Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

Copilot AI commented Apr 1, 2026 • edited by elinor-fung Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotnet-policy-service bot commented Apr 3, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

AaronRobinsonMSFT commented Apr 7, 2026

Uh oh!

elinor-fung commented Apr 7, 2026

Uh oh!

elinor-fung commented Apr 7, 2026

Uh oh!

Uh oh!

am11 Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

elinor-fung Apr 7, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Copilot AI commented Apr 1, 2026 •

edited by elinor-fung

Loading