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.

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

Improve SSL platform detection #64923

Merged
merged 8 commits into from
Feb 8, 2022
Merged

Improve SSL platform detection #64923

merged 8 commits into from
Feb 8, 2022

Conversation

wfurt
Copy link
Member

@wfurt wfurt commented Feb 7, 2022

This is platform detection part from #60163 (that is replaced by different change)
It added more generic support detection for Windows. No production code changes.

@wfurt wfurt added area-System.Net.Security test-enhancement Improvements of test source code labels Feb 7, 2022
@wfurt wfurt requested review from safern and a team February 7, 2022 18:14
@wfurt wfurt self-assigned this Feb 7, 2022
@ghost
Copy link

ghost commented Feb 7, 2022

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

Issue Details

This is platform detection part from #60163 (that is replaced by different change)
It added more generic support detection for Windows. No production code changes.

Author: wfurt
Assignees: wfurt
Labels:

area-System.Net.Security, test enhancement

Milestone: -

@safern
Copy link
Member

safern commented Feb 8, 2022

/azp runtime-extra-platforms

@azure-pipelines
Copy link

Command 'runtime-extra-platforms' is not supported by Azure Pipelines.

Supported commands
  • help:
    • Get descriptions, examples and documentation about supported commands
    • Example: help "command_name"
  • list:
    • List all pipelines for this repository using a comment.
    • Example: "list"
  • run:
    • Run all pipelines or specific pipelines for this repository using a comment. Use this command by itself to trigger all related pipelines, or specify specific pipelines to run.
    • Example: "run" or "run pipeline_name, pipeline_name, pipeline_name"
  • where:
    • Report back the Azure DevOps orgs that are related to this repository and org
    • Example: "where"

See additional documentation.

@safern
Copy link
Member

safern commented Feb 8, 2022

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@wfurt
Copy link
Member Author

wfurt commented Feb 8, 2022

While the tests still failed with #64944, SSL & HTTP runs seems clean on Windows.
I will merge this and I'll follow-up with more changes as needed.

@wfurt
Copy link
Member Author

wfurt commented Feb 8, 2022

/backport to release/6.0

@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2022

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1814919688

@github-actions
Copy link
Contributor

github-actions bot commented Feb 8, 2022

@wfurt backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: CI matrix change: add Windows Server 2022
Using index info to reconstruct a base tree...
M	eng/pipelines/libraries/helix-queues-setup.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/helix-queues-setup.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/helix-queues-setup.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CI matrix change: add Windows Server 2022
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@safern
Copy link
Member

safern commented Feb 8, 2022

@wfurt, seems like we need to backport it manually

@wfurt
Copy link
Member Author

wfurt commented Feb 8, 2022

yes, this is the main change that gives visibility to availably of given protocol version. I should probably be able to craft the 6.0 version today.

wfurt added a commit to wfurt/runtime that referenced this pull request Feb 9, 2022
* CI matrix change: add Windows Server 2022

* Add registry check for ssl3 - tls1.2 tests

* Disable TLS1.3 on framework code

* Fix typo

* revert queue change

Co-authored-by: Jan Jahoda <jajahoda@microsoft.com>
@ghost ghost locked as resolved and limited conversation to collaborators Mar 11, 2022
@karelz karelz added this to the 7.0.0 milestone Apr 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-System.Net.Security test-enhancement Improvements of test source code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants