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/7.0' => 'release/7.0-staging' #88652

Merged
merged 13 commits into from
Jul 12, 2023
Merged

[automated] Merge branch 'release/7.0' => 'release/7.0-staging' #88652

merged 13 commits into from
Jul 12, 2023

Commits on Jun 7, 2023

  1. Merge in 'release/7.0' changes

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

Commits on Jun 8, 2023

  1. Merge in 'release/7.0' changes

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

Commits on Jun 12, 2023

  1. [release/7.0] Change NamedPipe creation flags

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

Commits on Jun 13, 2023

  1. Merge in 'release/7.0' changes

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

  2. Merge in 'release/7.0' changes

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

  3. Merge in 'release/7.0' changes

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

  4. Merge in 'release/7.0' changes

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

Commits on Jun 20, 2023

  1. Merge in 'release/7.0' changes

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

  2. Merged PR 32088: Merged PR 32017: [7.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
    f0bc957 View commit details
    Browse the repository at this point in the history

  3. Merge in 'release/7.0' changes

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

Commits on Jul 11, 2023

  1. Merge pull request dotnet#88646 from carlossanlop/release/7.0-staging 

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

  2. Merge commit '8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7' into internal… 

    …-merge-7.0-2023-07-11-1024
    @vseanreesermsft
    vseanreesermsft committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4147d8e View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge pull request dotnet#88682 from vseanreesermsft/internal-merge-7… 

    ….0-2023-07-11-1024

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