Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[manual] Merge release/8.0-staging into release/8.0 #112381

Merged
merged 19 commits into from
Feb 11, 2025

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Feb 10, 2025

MERGE COMMIT

This PR might hit merge conflicts if #111410 gets merged before this.

rzikm and others added 18 commits January 15, 2025 14:14
…websites.net (dotnet#111401)

* Disable more tests dependent on http://corefx-net-http11.azurewebsites.net (dotnet#111354)

* Disable more tests dependent on http://corefx-net-http11.azurewebsites.net

* Disable winhttphandlertests

* Disable tests using http://corefx-net-http11.azurewebsites.net (dotnet#111235)

Disabling until HTTPS redirection can be turned off at the server.

* Fix build

* another attempt to fix build

* Fix build
…ease/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
…NO-MERGE` label is applied (dotnet#111962)

* Add workflow to prevent merging a PR when the `NO-MERGE` label is applied.

* Invert condition

* Fix backtick bug in check-service-labels echo.

---------

Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
* Add missing .alt_entry to CoreCLR *_FakeProlog methods

* Use .alt_entry on Apple platforms

* Remove explicit __compact_unwind entries from x64 assembler
…ference-packages (dotnet#111605)

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250117.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25067.1

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250131.5

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25081.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…50114.4 (dotnet#111411)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 8.0.0-prerelease.24510.2 -> To Version 8.0.0-prerelease.25064.4

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…110.1 (dotnet#111412)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24516.1 -> To Version 8.0.0-beta.25060.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…otnet#111445)

* Update dependencies from https://github.com/dotnet/runtime-assets build 20250114.1

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 8.0.0-beta.24517.1 -> To Version 8.0.0-beta.25064.1

* Update dependencies from https://github.com/dotnet/runtime-assets build 20250121.1

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 8.0.0-beta.24517.1 -> To Version 8.0.0-beta.25071.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
(cherry picked from commit 390973d)

Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
…nals build 20250204.1 (dotnet#112176)

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.25060.2 -> To Version 8.0.0-alpha.1.25104.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…dotnet#111434)

* Update dependencies from https://github.com/dotnet/hotreload-utils build 20250114.1

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 8.0.0-alpha.0.25063.2 -> To Version 8.0.0-alpha.0.25064.1

* Update dependencies from https://github.com/dotnet/hotreload-utils build 20250127.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 8.0.0-alpha.0.25063.2 -> To Version 8.0.0-alpha.0.25077.2

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
…ease/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Feb 10, 2025
@carlossanlop carlossanlop requested review from lewing and a team February 10, 2025 23:40
@carlossanlop carlossanlop self-assigned this Feb 10, 2025
* Add tests to verify issue and fix.

* Check for type-assignability instead of equivallence. Also fix Choice logic.

* Add tests to verify issue and fix.

* Ensure collections are initialized to empty - even if they should be null according to the xml.

* Disable test scenarios that find failures that aren't fixed until .Net 10.

* Is package authoring needed for this project?
@carlossanlop
Copy link
Member Author

@dotnet/runtime-infrastructure @dotnet/area-infrastructure-libraries there are two build failures currently blocking me from flowing to internal:

  1. hostfxr.exports: file format not recognized; treating as linker script:
[ 99%] Linking CXX shared library libhostpolicy.so
  /usr/local/bin/s390x-linux-gnu-ld:/__w/1/s/artifacts/obj/linux-s390x.Release/hostpolicy/standalone/hostpolicy.exports: file format not recognized; treating as linker script
  /usr/local/bin/s390x-linux-gnu-ld:/__w/1/s/artifacts/obj/linux-s390x.Release/hostpolicy/standalone/hostpolicy.exports:1: syntax error
  clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
  make[2]: *** [hostpolicy/standalone/CMakeFiles/hostpolicy.dir/build.make:435: hostpolicy/standalone/libhostpolicy.so] Error 1
  make[1]: *** [CMakeFiles/Makefile2:484: hostpolicy/standalone/CMakeFiles/hostpolicy.dir/all] Error 2
  make[1]: *** Waiting for unfinished jobs....
  [100%] Linking CXX shared library libhostfxr.so
  /usr/local/bin/s390x-linux-gnu-ld:/__w/1/s/artifacts/obj/linux-s390x.Release/fxr/standalone/hostfxr.exports: file format not recognized; treating as linker script
  /usr/local/bin/s390x-linux-gnu-ld:/__w/1/s/artifacts/obj/linux-s390x.Release/fxr/standalone/hostfxr.exports:1: syntax error
  clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
  make[2]: *** [fxr/standalone/CMakeFiles/hostfxr.dir/build.make:355: fxr/standalone/libhostfxr.so] Error 1
  make[1]: *** [CMakeFiles/Makefile2:405: fxr/standalone/CMakeFiles/hostfxr.dir/all] Error 2
  make: *** [Makefile:136: all] Error 2
  1. NuGet RestoreEx.targets - Signature has bad token:
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error : Signature has bad token. (0x8013123F) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at NuGet.Commands.RestoreArgs.GetEffectiveSourcesCore(ISettings settings, IList`1 dgSpecSources) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey key, Func`2 valueFactory) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at NuGet.Commands.DependencyGraphSpecRequestProvider.Create(String projectNameToRestore, ExternalProjectReference project, HashSet`1 projectReferenceClosure, RestoreArgs restoreArgs, DependencyGraphSpec projectDgSpec, SettingsLoadingContext settingsLoadingContext) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at NuGet.Commands.DependencyGraphSpecRequestProvider.<>c__DisplayClass8_0.<GetRequestsFromItems>b__2(String projectNameToRestore) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at System.Threading.Tasks.Parallel.<>c__DisplayClass19_0`2.<ForWorker>b__1(RangeWorker& currentWorker, Int64 timeout, Boolean& replicationDelegateYieldedBeforeCompletion) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error : --- End of stack trace from previous location --- [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at System.Threading.Tasks.Parallel.<>c__DisplayClass19_0`2.<ForWorker>b__1(RangeWorker& currentWorker, Int64 timeout, Boolean& replicationDelegateYieldedBeforeCompletion) [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
/Users/runner/work/1/s/.dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error :    at System.Threading.Tasks.TaskReplicator.Replica.Execute() [/Users/runner/work/1/s/src/libraries/sendtohelix.proj]
##[error].dotnet/sdk/8.0.110/NuGet.RestoreEx.targets(19,5): error : Signature has bad token. (0x8013123F)
   at NuGet.Commands.RestoreArgs.GetEffectiveSourcesCore(ISettings settings, IList`1 dgSpecSources)
   at System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey key, Func`2 valueFactory)
   at NuGet.Commands.DependencyGraphSpecRequestProvider.Create(String projectNameToRestore, ExternalProjectReference project, HashSet`1 projectReferenceClosure, RestoreArgs restoreArgs, DependencyGraphSpec projectDgSpec, SettingsLoadingContext settingsLoadingContext)
   at NuGet.Commands.DependencyGraphSpecRequestProvider.<>c__DisplayClass8_0.<GetRequestsFromItems>b__2(String projectNameToRestore)
   at System.Threading.Tasks.Parallel.<>c__DisplayClass19_0`2.<ForWorker>b__1(RangeWorker& currentWorker, Int64 timeout, Boolean& replicationDelegateYieldedBeforeCompletion)
--- End of stack trace from previous location ---
   at System.Threading.Tasks.Parallel.<>c__DisplayClass19_0`2.<ForWorker>b__1(RangeWorker& currentWorker, Int64 timeout, Boolean& replicationDelegateYieldedBeforeCompletion)
   at System.Threading.Tasks.TaskReplicator.Replica.Execute()

Build FAILED.

@akoeplinger
Copy link
Member

The first failure is on runtime-community linux-s390x build, it looks like it got broken by the azurelinux-3.0 image bump. You can ignore it for now.

@carlossanlop
Copy link
Member Author

carlossanlop commented Feb 11, 2025

/ba-g Unexpectedly, BuildAnalysis captured a runtime-extra-platforms failure for tvos-arm64-mono #112436 and also a runtime-community failure for s390x #112435 , which is something I had not seen before. Maybe they were captured for being build failures, not test failures.

@lewing @steveisok @akoeplinger @dotnet/dotnet-runtime-triage would you block the 8.0 release based on these two build failures? (I think we never block on runtime-community issues, but I'd prefer to get a confirmation).

@carlossanlop
Copy link
Member Author

I'll merge this PR to start the 8.0 builds. If we need to introduce a fix for any of these two failures, we will need the PRs submitted directly to the release/8.0 branch.

@carlossanlop carlossanlop merged commit 4e2e722 into dotnet:release/8.0 Feb 11, 2025
283 of 335 checks passed
@carlossanlop carlossanlop deleted the release/8.0-staging branch February 11, 2025 18:22
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants