microsoft / botbuilder-dotnet

Welcome to the Bot Framework SDK for .NET repository, which is the home for the libraries and packages that enable developers to build sophisticated bot applications using .NET.

https://github.com/Microsoft/botframework

MIT License

864 stars 480 forks source link

Merge main into southworks/update/net8-generators-templates-vsix #6788

Closed ahmed-dstny closed 1 month ago

ahmed-dstny commented 1 month ago

Fixes #6741

Description

Merged the Microsoft.Identity.Client bump (as well as all other recent changes back into the southworks/update/net8-generators-templates-vsix branch to fix the vulnerability errors in the original PR.

Specific Changes

No other changes.

Testing

No new features.

Automation: Parity with dotnet

@sw-joelmut @tracyboehrer

tracyboehrer commented 1 month ago

The Microsoft.Identity.Client change has already been merged to main.

tracyboehrer commented 1 month ago

Though most of these are just merges from main. This really isn't need since the .Net8 PR will merge all these anyway.

ahmed-dstny commented 1 month ago

It looked like the Microsoft.Identity.Client warning was the only thing holding his PR back, so Joel will have to merge your changes into his branch to pass those checks, I assume?

ahmed-dstny commented 1 month ago

@microsoft-github-policy-service agree company="Telali"

tracyboehrer commented 1 month ago

That isn't what is holding it back. We have to support 3.1 even though it's out of support until such a time as it causes a problem. For back compat with existing bots. The PR will automatically merge with main regardless. Or the engineer will merge with main to resolve the warning since we have enabled "warnings are errors" in the SDK.

ahmed-dstny commented 1 month ago

Ok. I'll close this PR.