-
Notifications
You must be signed in to change notification settings - Fork 10.4k
[automated] Merge branch 'release/3.0' => 'master' #12875
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/3.0' => 'master' #12875
Conversation
@SteveSandersonMS please double-check and merge |
…#12298) * Add helper methods on ControllerBase to return ProblemDetails * Introduce ControllerBase.Problem and ValidationProblem overload that accepts optional parameters * Consistently use ClientErrorData when generating ProblemDetails * Clean-up InvalidModelStateResponseFactory initialization. Fixes dotnet#8537
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
* Ensure JsonSerializer always HTML encodes output. * Update JsonOptions.JsonSerializerOptions to use encoder scheme that does not encode non-ASCII characters by default. This makes the encoding comparable to Json.NET's defaults * In SystemTextJsonHelper, ensure that the content is always HTML-encoded * Unskip skipped test Fixes dotnet#9946 Fixes dotnet#11459
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
…tnet#12679)" (dotnet#12744) * Revert "Revert "Improve components infrastructure (dotnet#12145)" (dotnet#12679)" This reverts commit e2d57e2. The improvement to components infrastructure is now reinstated with the following changes: * Check in release JS artifacts and use them as a fallback when it's not possible to build npmproj. * Dont' build nodejs in source build.
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
…net#12763) [Blazor][Fixes dotnet#11964] Limit the amount of pending renders * Adds a default limit of 10 queued pending renders per application. * Stops producing new render batches after that limit is hit. * Resumes producing render batches as soon as the client acknowledges a batch.
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
* Improve SetParametersAsync docs Fixes: dotnet#12820 * Clarify semantics of clashing cascading parameters This change attempts to lock down the semantics of how cascading parameters behave inside ParameterView.SetParameterProperties. Previously a cascading value could be used to set a non-cascading parameter, and vice-versa. We were just missing tests in general for how cascading values are interpreted by the parameter set logic.
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
* Update dependencies from https://github.com/dotnet/arcade build 20190804.1 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19404.1 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19404.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19404.1 * React to RenderTreeBuilder namespace change * Correct builds and tests needing additonal feeds - use `$(RestoreAdditionalProjectSources)` properties instead of generated NuGet.config files - this is closer to the previous approach but avoids `$(RestoreSources)` for the common feeds - also remove few remaining `$(RestoreSources)` mentions from SiteExtension.targets - no need to copy NuGet.config or add feeds in dotnet-watch tests - test projects restore within the repo (not in `$env:Temp`) and need no additional feeds nits: - $(NuGetConfigFile) hack in eng\Workarounds.props was getting in the way of previous approach and wasn't necessary * Update dependencies from https://github.com/aspnet/Blazor build 20190805.1 - Microsoft.AspNetCore.Blazor.Mono - 3.0.0-preview9.19405.1 * Update dependencies from https://github.com/aspnet/AspNetCore-Tooling build 20190805.6 - Microsoft.NET.Sdk.Razor - 3.0.0-preview9.19405.6 - Microsoft.CodeAnalysis.Razor - 3.0.0-preview9.19405.6 - Microsoft.AspNetCore.Razor.Language - 3.0.0-preview9.19405.6 - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0-preview9.19405.6 * Update dependencies from https://github.com/aspnet/EntityFrameworkCore build 20190805.13 - Microsoft.EntityFrameworkCore.Tools - 3.0.0-preview9.19405.13 - Microsoft.EntityFrameworkCore.SqlServer - 3.0.0-preview9.19405.13 - dotnet-ef - 3.0.0-preview9.19405.13 - Microsoft.EntityFrameworkCore - 3.0.0-preview9.19405.13 - Microsoft.EntityFrameworkCore.InMemory - 3.0.0-preview9.19405.13 - Microsoft.EntityFrameworkCore.Relational - 3.0.0-preview9.19405.13 - Microsoft.EntityFrameworkCore.Sqlite - 3.0.0-preview9.19405.13 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.BenchmarkRunner.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ActivatorUtilities.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.Memory - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.SqlServer - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Caching.StackExchangeRedis - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.CommandLineUtils.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.AzureKeyVault - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Binder - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.CommandLine - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.EnvironmentVariables - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.FileExtensions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Ini - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Json - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.KeyPerFile - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.UserSecrets - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration.Xml - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Configuration - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DependencyInjection - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.DiagnosticAdapter - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Diagnostics.HealthChecks - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Composite - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Embedded - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileProviders.Physical - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.FileSystemGlobbing - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HashCodeCombiner.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Hosting - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.HostFactoryResolver.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Http - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Localization - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Abstractions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.AzureAppServices - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Configuration - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Console - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Debug - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventSource - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.EventLog - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.TraceSource - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging.Testing - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ObjectPool - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.ConfigurationExtensions - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options.DataAnnotations - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Options - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ParameterDefaultValue.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Primitives - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.TypeNameHelper.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.ValueStopwatch.Sources - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.WebEncoders - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Internal.Extensions.Refs - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.JSInterop - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Mono.WebAssembly.Interop - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.Extensions.Logging - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Internal.AspNetCore.Analyzers - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) - Microsoft.AspNetCore.Testing - 3.0.0-preview9.19405.2 (parent: Microsoft.EntityFrameworkCore) * !fixup! close tag properly
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
This pull request has been updated. This PR merges commits made on release/3.0 by the following committers: |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
* Ensure IFormFile binding for nested properties works Fixes dotnet#9510
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
1 similar comment
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
a56f703
to
e504edb
Compare
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
4 similar comments
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
This comment was made automatically. If there is a problem contact [email protected]. I've triaged the above build. I've created/commented on the following issue(s) |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
@aspnet/build I believe this is good to go. I handled the merge conflicts in master. |
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
1 similar comment
❌ Uh oh, this pull request could not be updated automatically. New commits were pushed to release/3.0, but I could not automatically push those to merge/release/3.0-to-master to update this PR. |
I detected changes in the release/3.0 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.
This PR merges commits made on release/3.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/3.0-to-master'. 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.