Skip to content

Bring fixes from 3.2 line to 4.0#1229

Merged
TimHess merged 6 commits into
mainfrom
merge_forward
Dec 12, 2023
Merged

Bring fixes from 3.2 line to 4.0#1229
TimHess merged 6 commits into
mainfrom
merge_forward

Conversation

@TimHess
Copy link
Copy Markdown
Member

@TimHess TimHess commented Dec 8, 2023

Description

Apply fixes from several PRs against 3.2 in to 4.0. commits were applied in this order: #1142, #1170, #1200, #1208, #1219

Fixes #1169
Fixes #1199
Fixes #1178
Fixes #1218
Fixes #1217

Quality checklist

  • Your code complies with our Coding Style.
  • You've updated unit and/or integration tests for your change, where applicable.
  • You've updated documentation for your change, where applicable.
    If your change affects other repositories, such as Documentation, Samples and/or MainSite, add linked PRs here.
  • There's an open issue for the PR that you are making. If you'd like to propose a new feature or change, please open an issue to discuss the change or find an existing issue.
  • You've added required license files and/or file headers (explaining where the code came from with proper attribution), where code is copied from StackOverflow, a blog, or OSS.

@TimHess TimHess added the ReleaseLine/4.x Identified as a feature/fix for the 4.x release line label Dec 8, 2023
@TimHess TimHess added this to the 4.0.0-m1 milestone Dec 8, 2023
@TimHess TimHess requested a review from bart-vmware December 8, 2023 21:41
@TimHess TimHess self-assigned this Dec 8, 2023
@TimHess
Copy link
Copy Markdown
Member Author

TimHess commented Dec 8, 2023

/azp run cleanup-code

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Code cleanup failed to reformat and push changes.

View details here.

Comment thread src/Common/test/Common.Security.Test/CertificateRotationServiceTest.cs Outdated
Comment thread src/Configuration/test/SpringBoot.Test/SpringBootHostBuilderExtensionsTest.cs Outdated
Comment thread src/Common/test/Common.Security.Test/CertificateRotationServiceTest.cs Outdated
@bart-vmware
Copy link
Copy Markdown
Member

Looks like pr-code-cleanup.yml is broken. To fix it, replace:
--dotnetcoresdk=$(dotnet --version)
with:
--jb --dotnetcoresdk=$(dotnet --version)

@TimHess
Copy link
Copy Markdown
Member Author

TimHess commented Dec 11, 2023

Looks like pr-code-cleanup.yml is broken. To fix it, replace: --dotnetcoresdk=$(dotnet --version) with: --jb --dotnetcoresdk=$(dotnet --version)

Thanks, I figured that out this morning from cleanupcode.ps1

Copy link
Copy Markdown
Member

@bart-vmware bart-vmware left a comment

Choose a reason for hiding this comment

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

Can you please add a commit to fix this one?

Looks like pr-code-cleanup.yml is broken. To fix it, replace:
--dotnetcoresdk=$(dotnet --version)
with:
--jb --dotnetcoresdk=$(dotnet --version)

Comment thread src/Configuration/test/SpringBoot.Test/SpringBootHostBuilderExtensionsTest.cs Outdated
@TimHess TimHess merged commit 2018cf7 into main Dec 12, 2023
@TimHess TimHess deleted the merge_forward branch December 12, 2023 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment