.NET 6: Alpine backporting

[ayakael]

Issue tracker for Alpine patch backporting for .NET 6

Goals

Backport all patches currently used by Alpine's dotnet6 package

Clang patches

• runtime_73065-define-cpuidex-only-when-no-builtin.patch
  [release/6.0] Define __cpuid{ex} only when there's no builtin one (backport of #73065) runtime#77507

Source-build related patches

• sdk_14239-add-zsh-compdef-completion-script.patch
  (waiting on main)
• sdk_22373-portable-runtime-id.patch
  [release/6.0.1xx] Use the portable rid for --use-current-runtime (backports #21748) sdk#27849

s390x / ppc64le related patches

• msbuild_optional-systemconfiguration.patch
  (not to be backported)
• msbuild_optional-systemsecurity.patch
  (not to be backported)
• roslyn_57003-mono-namedmutex.patch
  (to be backported)
• runtime_76500-mono-musl-support.patch
  [release/6.0] Mono musl support (backport #76500) runtime#78274
• runtime_60315-momo-remove-ilstrip.patch
  [release/6.0] Source-Build: Remove ILStrip dependency from mono runtime#77503
• runtime_60675-mono-sterror.patch
  [release/6.0] Fix gcc warnings during mono linux-x64 build (backport of #60675) runtime#77505
• runtime_66594-keep-native-symbols.patch
  [release/6.0] Fix KeepNativeSymbols to work on mono as well (backport of #66594) runtime#77506
• arcade_11608-crossbuild-fixes.patch
  (waiting on main)

arm related patches

• installer_13378-arm-build.patch
  [release/6.0.1xx] Arm support installer#13378

Non-portable build patches

• aspnetcore_43937-support-building-with-nonportable-runtime.patch
  ([release/6.0] source-build: support building aspnetcore using non-portable runtime packages (backport #43937) aspnetcore#44752)
• build_14549-no-portable-build
  [release/6.0.1xx] Eliminate runtime portable build installer#14816
• runtime_74504-pass-targetrid-to-native-scripts.patch
  [release/6.0] Pass TargetRid and SourceBuildNonPortable to the native scripts (backport of #74504) runtime#77508
  [release/6.0] source-build.yml: add runtimeOS parameter (backport #10782) arcade#11604
  [release/6.0] Update dependencies from dotnet/arcade runtime#78425
• runtime_75597-support-building-runtime-with-non-portable-runtime.patch
  [release/6.0] source-build: support building runtime using non-portable runtime packages (backport of #75597) runtime#77509
• runtime_76068-use-generated-runtimejson-when-building-sharedframework.patch
  [release/6.0] Use generated runtime.json when building shared framework packages (backport of #76068) runtime#77510
• sdk_28380-map-nonportable-rids-when-targetos-is-determined.patch
  [release/6.0.1xx] ResolveReadyToRunCompilers: map non-portable rids when targetOS is determined (backport #28380) sdk#28782

[ayakael]

@omajid I went ahead and made a PR for removing ILStrip dependency on Mono, seeing as how it doesn't seem like you've upstreamed it: dotnet/runtime#77503

Also, should I make a PR for the msbuild stuff?

Finally, for roslyn, how do I go about backporting the patch given lack of release/6.0 branch?

[omajid]

Also, should I make a PR for the msbuild stuff?

See #2618 (comment). We could continue carrying this patch locally, but sharing it would be better.

Finally, for roslyn, how do I go about backporting the patch given lack of release/6.0 branch?

That's a good question. If we look in dotnet/installer's release/6.0.1xx branch, it's using roslyn commit 487283bcd8d66693091f2800dcf1c8ae37cccdee: https://github.com/dotnet/installer/blob/5700aea798f6940ad4a713b0bc3b31bdf6e8efd8/eng/Version.Details.xml#L144-L148

$ cd roslyn
$ git branch --contains 487283bcd8d66693091f2800dcf1c8ae37cccdee
* main
  release/dev17.4

So, it sounds like we should make the PR against the release/dev17.4 branch? Hopefully a roslyn maintainer can correct us if we get it wrong.

[ayakael]

Also, should I make a PR for the msbuild stuff?

See #2618 (comment). We could continue carrying this patch locally, but sharing it would be better.

Finally, for roslyn, how do I go about backporting the patch given lack of release/6.0 branch?

That's a good question. If we look in dotnet/installer's release/6.0.1xx branch, it's using roslyn commit 487283bcd8d66693091f2800dcf1c8ae37cccdee: https://github.com/dotnet/installer/blob/5700aea798f6940ad4a713b0bc3b31bdf6e8efd8/eng/Version.Details.xml#L144-L148

$ cd roslyn
$ git branch --contains 487283bcd8d66693091f2800dcf1c8ae37cccdee
* main
  release/dev17.4

So, it sounds like we should make the PR against the release/dev17.4 branch? Hopefully a roslyn maintainer can correct us if we get it wrong.

Ulrich beat me to the punch, they backported the patch a week ago. Thanks @uweigand!

[ayakael]

Actually, what am I talking about?! They fixed the bug a week ago + 1 year. I think we need to update our Version.Details.Xml to pull latest commit from dev/17.4

[ayakael]

dev/17.4 is way too new for release/6.0.1xx, and there's no branch dedicated to release/6.0.1xx. @MichaelSimons Is this something that we can propose to the roslyn devs? I see they have a release/6.0.1xx-rc2 branch. It'd be nice to have the option to maintain servicing branches in the future.

If not, is this something we could ship within the source-build patches for release/6.0.1xx of installer?

[ayakael]

Would anyone know when we will jump to a new feature version (like 6.0.4xx) so I can get ahead of the curve and backport the proper patches to avoid regressions?