Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #88653

Merged
merged 15 commits into from
Jul 12, 2023
Merged

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #88653

merged 15 commits into from
Jul 12, 2023

Commits on May 23, 2023

  1. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed May 23, 2023
    Configuration menu
    Copy the full SHA
    bb9f3c3 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    f1badee View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    333b0ec View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. [release/6.0] Change NamedPipe creation flags

    @hoyosjs
    hoyosjs committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    61d7c70 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    18a65e3 View commit details
    Browse the repository at this point in the history

  2. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e2176df View commit details
    Browse the repository at this point in the history

  3. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    feff9df View commit details
    Browse the repository at this point in the history

  4. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    fcf1149 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    ec47be0 View commit details
    Browse the repository at this point in the history

  2. Merged PR 32087: Merged PR 32016: [6.0] Fix regression loading null-p… 

    …assword encrypted PFX certificates

When decrypting the payload with empty string and null passwords, try reading the payload with the Asn reader to ensure the header matches the expected format. If that succeeds, then proceed with the iteration counting. This guards against a false-positive match that previously caused our iteration count work to throw/abort, thus preventing some null-password encrypted payloads from being loaded.
    @jeffhand @mmitche
    jeffhand authored and mmitche committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    07516cc View commit details
    Browse the repository at this point in the history

  3. Merge in 'release/6.0' changes

    @dotnet-bot
    dotnet-bot committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    a08d9ce View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Update dependencies from https://github.com/dotnet/emsdk build 202307… 

    …07.3 (dotnet#88535)

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.20 -> To Version 6.0.21

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    @dotnet-maestro
    dotnet-maestro[bot] and dotnet-maestro[bot] committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    b870d77 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge pull request dotnet#88645 from carlossanlop/release/6.0-staging 

    [manual] Merge release/6.0-staging into release/6.0
    @ViktorHofer
    ViktorHofer committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ae21b6f View commit details
    Browse the repository at this point in the history

  2. Merge commit 'a08d9ce2caf02455c0b825bcdc32974bdf769a80' into internal… 

    …-merge-6.0-2023-07-11-1018
    @vseanreesermsft
    vseanreesermsft committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b698586 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge pull request dotnet#88680 from vseanreesermsft/internal-merge-6… 

    ….0-2023-07-11-1018

Merging internal commits for release/6.0
    @carlossanlop
    carlossanlop committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    372357d View commit details
    Browse the repository at this point in the history