-
Notifications
You must be signed in to change notification settings - Fork 10.4k
[automated] Merge branch 'release/3.1' => 'master' #21791
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
Merged
jkotalik
merged 36 commits into
dotnet:master
from
dotnet-maestro-bot:merge/release/3.1-to-master
May 15, 2020
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
b531792
Merged PR 6773: Fix routing policy exit destination
95e1891
Merge in 'release/3.1' changes
dotnet-bot a68e5e2
Merge in 'release/3.1' changes
dotnet-bot a9d1e2a
Merge in 'release/3.1' changes
dotnet-bot 7633def
Merge in 'release/3.1' changes
dotnet-bot a22e71f
Merge in 'release/3.1' changes
dotnet-bot e3bd613
Merge in 'release/3.1' changes
dotnet-bot a2428c7
Merge in 'release/3.1' changes
dotnet-bot 45a57ea
Merge in 'release/3.1' changes
dotnet-bot 23c02ef
Merged PR 7269: Avoid caching JsonSerializer
c53e15e
Merged PR 6988: [internal/release/3.1] Update dependencies from 1 rep…
dotnet-bot 12c9727
Merge in 'release/3.1' changes
dotnet-bot 4f307c4
Merge in 'release/3.1' changes
dotnet-bot 536f2e5
Merged PR 7173: Update dependencies from EFCore
wtgodbe 67e0439
Merged PR 7373: [internal/release/3.1] Update dependencies from 1 rep…
dotnet-bot 2cad2ed
Merged PR 7488: Downgrade WinHttpHandler to 4.7.0
wtgodbe 3358292
Merged PR 7529: Update dependencies from efcore
wtgodbe 35628a6
Merged PR 7537: [internal/release/3.1] Update dependencies from 1 rep…
dotnet-bot a14119a
Merge remote-tracking branch 'internal/internal/release/3.1' into wtg…
wtgodbe 736e57f
Remove int feeds from nuget.config
wtgodbe 58bb85a
Update branding to 3.1.5
wtgodbe ca52b8f
Update baselines
wtgodbe f0e8ccf
Merge pull request #21760 from dotnet/wtgodbe/315
wtgodbe 9e2a480
[release/3.1] Add .version file to shared framework zip (#21548)
wtgodbe 8ff1cb9
Set certificate in some Kestrel tests to avoid global machine state (…
BrennanConroy b194b6c
Fix use of precedence in endpoint routing DFA (#20801) (#21200)
rynowak de38479
Improve build reliability (#20760)
dougbu b3c6c43
Remove the need for a global lock when building or publishing a proje…
pranavkm 016e3d6
[release/3.1] Move SDL validation to ringed release (#21153)
wtgodbe f9b4101
Merge remote-tracking branch 'origin/release/3.1'
8fba9b0
Use ActivatorUtilities shared source
e7f3941
Revert "Quarantine all ProjectTemplate tests until dotnet new lock is…
jkotalik a5136c1
Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…
jkotalik 6725c71
Update Microsoft.AspNetCore.Http.Abstractions.csproj
jkotalik b3c78ff
Merge branch 'merge/release/3.1-to-master' of https://github.com/dotn…
jkotalik 91f7ff8
Remove unneeded reference changes
jkotalik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| // This file is used by Code Analysis to maintain SuppressMessage | ||
| // attributes that are applied to this project. | ||
| // Project-level suppressions either have no target or are given | ||
| // a specific target and scoped to a namespace, type, member, etc. | ||
|
|
||
| [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage( | ||
| "Build", | ||
| "xUnit1013:Public method 'Quirks_CatchAllParameter' on test class 'FullFeaturedMatcherConformanceTest' should be marked as a Theory.", | ||
| Justification = "This is a bug in the xUnit analyzer. This method is already marked as a theory.", | ||
| Scope = "member", | ||
| Target = "~M:Microsoft.AspNetCore.Routing.Matching.FullFeaturedMatcherConformanceTest.Quirks_CatchAllParameter(System.String,System.String,System.String[],System.String[])~System.Threading.Tasks.Task")] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dougbu should this logic be merged forward from 3.1 to 5.0? It's causing a bunch of failures on CI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should be fine but none of the added block just below should be in 'master'.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Deleting from line 219 to 265 then 😄