Skip to content

Fix patchconfig merge #18389

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.

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

Merged
merged 1 commit into from
Jan 16, 2020
Merged

Fix patchconfig merge #18389

merged 1 commit into from
Jan 16, 2020

Conversation

Tratcher
Copy link
Member

Fixes a versioning issue from recent merges in the patchconfig.

@Tratcher Tratcher added this to the 2.1.x milestone Jan 16, 2020
@Tratcher Tratcher requested a review from JunTaoLuo January 16, 2020 18:05
@Tratcher Tratcher self-assigned this Jan 16, 2020
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jan 16, 2020
@Tratcher Tratcher assigned JunTaoLuo and unassigned Tratcher Jan 16, 2020
@JunTaoLuo JunTaoLuo merged commit c919c58 into release/2.1 Jan 16, 2020
@JunTaoLuo JunTaoLuo deleted the tratcher/2.1/15 branch January 16, 2020 21:45
mkArtakMSFT pushed a commit that referenced this pull request Jan 17, 2020
* [Platform] Detect and fix certificates with potentially inaccessible keys on Mac OS (2.1) (#17560)

* [Https] Detects and fixes HTTPS certificates where the key is not guaranteed to be accessible across security partitions

* Fix dotnet dev-certs https --check

* Update logic for detecting missing certs

* Fix security command

* Update warning logic

* Check that the key is accessible in Kestrel

* Add correct link to docs

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <[email protected]>

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Daniel Roth <[email protected]>

* Add test for 2.1

* Update src/Tools/dotnet-dev-certs/src/Program.cs

Co-Authored-By: Chris Ross <[email protected]>

* Address feedback

* Fix non-interctive path

* Fix tests

* Remove a couple of test from an unshipped product

* Check only for certificates considered valid

* Switch the exception being caught, remove invalid test

Co-authored-by: Daniel Roth <[email protected]>
Co-authored-by: Chris Ross <[email protected]>

* Fix patchconfig merge (#18389)

* Fix flaky HubConnectionHandler test (#18391)

Co-authored-by: Javier Calvarro Nelson <[email protected]>
Co-authored-by: Daniel Roth <[email protected]>
Co-authored-by: Chris Ross <[email protected]>
Co-authored-by: Brennan <[email protected]>
@dougbu dougbu modified the milestones: 2.1.x, 2.1.16 Oct 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants