Return ValueTask in loggers and interceptors #21152
Conversation
|
Should target release/5.0-preview6 |
|
Don't we merge to master first and then cherry-pick? Or should I send an additional PR for release/5.0-preview6? |
|
I thought it was release/5.0-preview6 first and then merge to master. |
|
Doing it either way should be fine though |
|
Apart from patch which requires additional approval, we merge into earlier release first then cascade the changes to later releases. For patch we started doing other way around because if the fix in master is already risky, we may not actually patch it. |
|
Thanks @AndriySvyryd @smitpatel, for this one will merge the PR to master first since it's already submitted and there's little difference. A small nit - I think submitting to master first is slightly better.. when submitting the PR against release/5.0.0-*** we can cherry-pick the commit from master, and include a reference to that commit (git cherry-pick -x) for reference. If we do it the other way around, master's git history is polluted with references to release branches, which seems less ideal.. |
|
Also, when there are conflicts (as there are in this case), it seems better to first do the work against the latest master as we're used to, and then resolve conflicts against older versions rather than the other way around... |
We always merge release to master anyway so what is the pollution. |
|
Did not realize that, guess I'm used to a different flow - I'm used to work always happening in master, and getting cherry-picked to release or patch branches as appropriate. Release/patch commits always reference the master commits they were cherry-picked from ( Indeed if we always merge release branches back to master it doesn't matter. |
* [release/5.0-preview6] Update dependencies from dotnet/arcade (#21111) * Update dependencies from https://github.com/dotnet/arcade build 20200530.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20280.1 * [master] Update dependencies from dotnet/arcade (#21091) * Update dependencies from https://github.com/dotnet/arcade build 20200528.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4 * Update dotnet on helix Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> * Return ValueTask in loggers and interceptors (#21152) (#21158) Closes #21109 (cherry picked from commit 9f316e5) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: Shay Rojansky <roji@roji.org>
* [release/5.0-preview6] Update dependencies from dotnet/arcade (#21111) * Update dependencies from https://github.com/dotnet/arcade build 20200530.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20280.1 * [master] Update dependencies from dotnet/arcade (#21091) * Update dependencies from https://github.com/dotnet/arcade build 20200528.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 5.0.0-beta.20261.9 -> To Version 5.0.0-beta.20278.4 * Update dotnet on helix Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> * Return ValueTask in loggers and interceptors (#21152) (#21158) Closes #21109 (cherry picked from commit 9f316e5) * Add ConfigureAwait(false) (#21110) (#21185) Set up Microsoft.CodeAnalysis.FxCopAnalyzers with only the ConfigureAwait rule enabled. Closes #10164 (cherry picked from commit e1c9a3a) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brennan <brecon@microsoft.com> Co-authored-by: Shay Rojansky <roji@roji.org>
3 participants
Closes #21109