Skip to content

Merging internal commits for release/6.0#87493

Merged
carlossanlop merged 19 commits intodotnet:release/6.0from
vseanreesermsft:internal-merge-6.0-2023-06-13-1011
Jun 13, 2023
Merged

Merging internal commits for release/6.0#87493
carlossanlop merged 19 commits intodotnet:release/6.0from
vseanreesermsft:internal-merge-6.0-2023-06-13-1011

Conversation

@vseanreesermsft
Copy link

No description provided.

dotnet-bot and others added 19 commits April 5, 2023 00:35
…ypes that implements INullable

CVE-2023-24936: Check type is allowed when deserializing instance types that implements INullable
… and enable delay load of version.dll

`coreclr` delay loads `version.dll` and adds a hook such that it loads from the system directory. In single-file, we lost this behaviour since it uses static library version of `coreclr`. This adds the same mechanism to single-file.
…e loading

Block password-less PKCS12 blobs on X509 certificate loadings/imports and prevent AIA fetching of non-cert types.
@ghost
Copy link

ghost commented Jun 13, 2023

Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author: vseanreesermsft
Assignees: vseanreesermsft
Labels:

area-System.Security

Milestone: -

Copy link
Contributor

@carlossanlop carlossanlop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder to self: Need to reset the OOB packages that came from internal. Will do this in a separate PR that needs to be merged on code complete day next month.

@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow and removed area-System.Security labels Jun 13, 2023
@carlossanlop
Copy link
Contributor

The failure message is unrelated and expected:

src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj(0,0): error NU1603: (NETCORE_ENGINEERING_TELEMETRY=Restore) Microsoft.NETCore.App.Runtime.osx-x64 depends on Microsoft.DiaSymReader.Native (>= 16.11.27-beta1.23180.1) but Microsoft.DiaSymReader.Native 16.11.27-beta1.23180.1 was not found. An approximate best match of Microsoft.DiaSymReader.Native 17.0.0-beta1.21524.1 was resolved.

It will go away as soon as the new Microsoft.DiaSymReader.Native version is pushed to nuget.

@carlossanlop carlossanlop merged commit 779d886 into dotnet:release/6.0 Jun 13, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Jul 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

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.

7 participants