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

Merge v724-or-v730 to default branch #979

Merged
merged 25 commits into from
Dec 16, 2022
Merged

Conversation

martincostello
Copy link
Member

Merges all the commits from v724-or-v730 to the default branch.

The changes in the following commits have been reverted for now as they created a huge merge conflict:

As I assume they were applied with automated tools, it should be easy enough to re-apply them once the v724-or-v730 branch is merged and deleted.

Replaces #977 and #978.

martincostello and others added 23 commits January 17, 2022 16:55
Bump version to 7.3.1 for next release.
Change version to 7.2.4 for next release.
* Add RateLimit benchmarks

Add benchmarks for the rate-limit policy.

* Change NuGet baseline

The latest release is 7.2.3, not 7.3.0.
Co-authored-by: Georgy Levchenko <lewshadow@gmail.com>
* Upgrade FluentAssertions package

* Fix broken test

* Async all the things

Await all usages of Awaiting().

Co-authored-by: martincostello <martin@martincostello.com>
Add coverlet.msbuild to collect code coverage from the tests.
Add default tasks for building and testing Polly with Visual Studio Code.
* Bump up cake to v2.0.0

* Target the tools to a specific version
Do not edit the csproj outside CI.
Use xplat path joining.
Fix some casing.
Make brace styles/spacing consistent.
Add shebang for pwsh.
Remove redundant variable.
Set the executable bit for macOS and Linux.
Disable showing the download progress bar when downloading files.
Skip running the tests for .NET Framework on non-Windows operating systems.
.NET Core 2.1 is no longer supported.
Speed up CI by setting some additional environment variables.
Use file-scoped namespaces to try and resolve the merge conflicts with the default branch.
Ignore commits for file-scoped namespaces in `git blame` on GitHub.com.
This reverts commit 87cf9c0.
Add revert commit.
Add a GitHub Actions CI to see if it's more stable than AppVeyor's flakiness.
@martincostello martincostello changed the title Undo syntax changes Merge v724-or-v730 to default branch Dec 16, 2022
- Add Linux and macOS to the mix.
- Add include which should fix the artifact upload name.
Remove them for now as they don't work.
@martincostello
Copy link
Member Author

martincostello commented Dec 16, 2022

I'm happy enough that the build isn't really broken and that AppVeyor is just being flaky (flakier) than normal as the new simple GitHub Actions version is working.

Will do a PR to restore the file-scoped namespaces shortly and (see e327306) open an issue to track fixing the health of CI.

@martincostello martincostello merged commit ff2ec4c into master Dec 16, 2022
@martincostello martincostello deleted the undo-syntax-changes branch December 16, 2022 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants