Skip to content

[manual] Merge release/6.0-staging into release/6.0 - #107572

Merged
carlossanlop merged 4 commits into
dotnet:release/6.0from
carlossanlop:release/6.0-staging
Sep 10, 2024
Merged

[manual] Merge release/6.0-staging into release/6.0#107572
carlossanlop merged 4 commits into
dotnet:release/6.0from
carlossanlop:release/6.0-staging

Conversation

@carlossanlop

@carlossanlop carlossanlop commented Sep 9, 2024

Copy link
Copy Markdown
Contributor

Merge commit!

carlossanlop and others added 4 commits September 4, 2024 14:43
@carlossanlop
Merge pull request #106341 from dotnet/merge/release/6.0-to-release/6…
26c2e13 
….0-staging

[automated] Merge branch 'release/6.0' => 'release/6.0-staging'
@github-actions @vcsjones
[release/6.0-staging] Fix copying ephemeral keys to keychains.
875f45f 
Starting on macOS Sequoia, at least in beta, SecKeychainitemCopyKeychain no longer returns errSecNoSuchKeychain for ephemeral keys.
Instead, it returns errSecInvalidItemRef.

This adds the error code in the handling logic for when we need to add an ephemeral key to the target keychain.

Co-authored-by: Kevin Jones <kevin@vcsjones.com>
@steveharter
[release/6.0] ComponentModel threading fixes (#107354)
e32da1e
@akoeplinger
[android] Bump to win 11 helix queue (#107450)
c52f595
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Sep 9, 2024
@carlossanlop carlossanlop added this to the 6.0.35 milestone Sep 9, 2024
@carlossanlop
carlossanlop requested review from a team September 9, 2024 21:16
@carlossanlop carlossanlop self-assigned this Sep 9, 2024
@carlossanlop

carlossanlop commented Sep 9, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@dotnet/area-infrastructure-libraries @dotnet/area-system-formats-asn1 In the Build windows x64 Release Libraries_NET48 leg, that System.Formats.Asn1 assembly could not be loaded, but there were no changes there this month:

Unhandled Exception: System.IO.FileLoadException: Could not load file or assembly 'System.Formats.Asn1, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' or one of its dependencies. The located assembly's manifest definition does not match the assembly reference. (Exception from HRESULT: 0x80131040)
   at System.Formats.Asn1.Tests.Reader.ReadObjectIdentifier.<>c.<ReadVeryLongOid_WithAppContext>b__9_0()
--- End of stack trace from previous location where exception was thrown ---
   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
   at Microsoft.DotNet.RemoteExecutor.Program.Main(String[] args)

I will go ahead and merge this as it's unrelated, but we should look at this tomorrow morning. Any fix should go straight to the release/6.0 branch.

This has been happening since July: #104647

@carlossanlop
carlossanlop merged commit a12ce66 into dotnet:release/6.0 Sep 10, 2024
@carlossanlop
carlossanlop deleted the release/6.0-staging branch September 10, 2024 02:52
This was referenced Sep 11, 2024
Open
Open
@github-actions github-actions Bot locked and limited conversation to collaborators Oct 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@carlossanlop carlossanlop

Labels

area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release

Projects

None yet

Milestone

6.0.35

Development

Successfully merging this pull request may close these issues.

3 participants

@carlossanlop @steveharter @akoeplinger