-
Notifications
You must be signed in to change notification settings - Fork 822
[automated] Merge branch 'release/8.0' => 'main' #4554
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
[automated] Merge branch 'release/8.0' => 'main' #4554
Conversation
* Remove project names * Revert changes made in other PR
* Layer enrichment & redaction on top of HttpLogging * Cleanup * Extract enrichment, cleanup * Remove duration * Remove duration * API updates * Experimental * Target net80, remove old code, fix up tests * PR feedback, tests * Test cleanup * CombineLogs, fix tests * Cleanup, reduce diff * Spacing * React to duration changes * Update SDK to 8.0.100-rc.2.23451.1 * Experimental * Use HttpContext * Config binding * Cleanup * Duplicate options? * Remove LogMethodHelper * Revert "Duplicate options?" This reverts commit 582a508. # Conflicts: # src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/HttpLoggingServiceCollectionExtensions.cs * Don't combine options * Consolidate enrichers * Cleanup metadata * Remove LogMethodHelper tests * More LogMethodHelper * Warnings * More LogMethodHelper * Fixup baseline * Test coverage * Update src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/RequestHeadersLogEnricherOptions.cs * Delete src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/RequestHeadersLogEnricherOptionsValidator.cs * Update RequestHeadersEnricherServiceCollectionExtensions.cs * Delete more * Delete more * Options, docs, binding * Cleanup headers log enricher * Less experimental * Warnings * Fix dimensions
* Pasting the exact same file as in dotnet/runtime. * Remove runtime-specific code. * Update global.json Microsoft.Build.NoTargets to 3.7.0. * Add LibrariesProjectRoot property to root Directory.Build.props * Initial adaptation of Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj * Failed attempt to fix the first set of errors * Make transport package build * tweaks * More tweaks * boo * Fix stage * Append the specific *.proj to the _ProjectsToBuild in eng/build.proj * Move PackageDescription a few lines below so that TargetFramework is the first property. * Exclude this proj from ProjectReference * Update src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com> --------- Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: Igor Velikorossov <igor.velikorossov@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
* Update global.json * Fix build --------- Co-authored-by: Igor Velikorossov <igor.velikorossov@microsoft.com>
Place internal files appropriately Co-authored-by: Nikita Balabaev <nbalabaev@microsoft.com>
…0231009.3 (dotnet#4547) Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.Features , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 8.0.0-rtm.23506.5 -> To Version 8.0.0-rtm.23509.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
a66de89
to
4d308e5
Compare
* Add HeaderParsing README * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Chris Ross <Tratcher@Outlook.com> * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Chris Ross <Tratcher@Outlook.com> * Fix named argument for configuration * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Chris Ross <Tratcher@Outlook.com> * Fix build errors * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Chris Ross <Tratcher@Outlook.com> * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Dan Moseley <danmose@microsoft.com> * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md Co-authored-by: Dan Moseley <danmose@microsoft.com> * Update src/Libraries/Microsoft.AspNetCore.HeaderParsing/README.md --------- Co-authored-by: Chris Ross <Tratcher@Outlook.com> Co-authored-by: Dan Moseley <danmose@microsoft.com>
…0231010.7 (dotnet#4551) Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.Features , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23510.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1f1261a
to
91a4d41
Compare
* Fix FakeTimeProvider namespace, add readme * More namespaces * get set * Revert "More namespaces" This reverts commit c6ff1a3. Revert "Fix FakeTimeProvider namespace, add readme" This reverts commit 3e4e2fc. # Conflicts: # src/Libraries/Microsoft.Extensions.TimeProvider.Testing/README.md * Standardize
* Add Diagnostics.Middleware readme * Feedback * Standardize
* Update Parser.cs * Create NoNamespace test file * Update test/Generators/Microsoft.Gen.EnumStrings/TestClasses/NoNamespace.cs * Update test/Generators/Microsoft.Gen.EnumStrings/TestClasses/NoNamespace.cs
* Removing the XXHash3Redactor * Addressing Feedback --------- Co-authored-by: Jose Perez Rodriguez <joperezr@microsoft.com>
@rafal-mz - any updates here? Can you help unblock this PR? |
…otnet#4566) Co-authored-by: Jan Guttek <jagutt@microsoft.com>
…005.1 (dotnet#4569) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Martin Taillefer <mataille@microsoft.com>
…-maestro-bot/Common into merge/release/8.0-to-main
dotnet/installer#17581 should fix this. We'll need to pull a new SDK. |
@RussKie do we have to do that manually? |
@xakep139 should be fixed now. |
Oh, restore is broken in this build...
|
This failure is the one where multiple tools in a |
Now blocked by a different SDK issue being investigated independently: #4606 |
A never-ending story, hah... |
The |
Yes, I'd expect another merge PR now that this one finally went through. It might not trigger until we merge into release/8.0 again. We could also do it manually. |
@wtgodbe do you know if the automated release/8.0->main merge is still active for this repo? |
I started a manual merge PR: #4689. Anyone want to work on merge conflicts? 😆 |
I'll have a go at those, at least as far as obvious ones. |
It is - Chris' comment above yours is correct, the next commit into 8.0 will trigger another PR being opened. |
I detected changes in the release/8.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/8.0 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.
Microsoft Reviewers: Open in CodeFlow