Skip to content

[automated] Merge branch 'release/2.1' => 'main' #30797

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.

Sign up for GitHub

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
16 commits merged into from
Mar 17, 2021
Merged

[automated] Merge branch 'release/2.1' => 'main' #30797

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8f59b0c
Merged PR 12859: [release/2.1] Unpin System.Text.Encodings.Web
dougbu Feb 12, 2021
6111c2e
Merge in 'release/2.1' changes
dotnet-bot Feb 17, 2021
604efe7
Merged PR 13056: Patch packages that depend on System.Text.Encodings.Web
wtgodbe Feb 18, 2021
f7e5194
Merged PR 13057: Add direct reference to S.T.E.W for Razor test projects
wtgodbe Feb 19, 2021
2e56411
Reference .dll directly
wtgodbe Feb 19, 2021
013de63
Merged PR 13067: Try setting metadata for S.T.E.W
wtgodbe Feb 19, 2021
62e2742
Merge in 'release/2.1' changes
dotnet-bot Feb 27, 2021
bdd5c49
Update baseline and SDK
Mar 9, 2021
69ad16c
Repin STEW
Mar 9, 2021
2834542
Split UnitTests/net461 up more
dougbu Mar 4, 2021
cea1fe3
Merge pull request #30779 from dotnet/johluo/2.1
dougbu Mar 10, 2021
17ba50c
[release/2.1] Fixup NPM package versioning (#30164)
dougbu Mar 10, 2021
b9baf8c
2.1 SignalR npm readme (#30271)
BrennanConroy Mar 10, 2021
bffb3ca
[release/2.1] Include transitive refs in meta-package .nuspec files (…
dougbu Mar 12, 2021
fd7ee03
Add a bit more to Microsoft.AspNetCore.App.nuspec (#30895)
dougbu Mar 12, 2021
e57d9e7
Merge remote-tracking branch 'origin/release/2.1'
pranavkm Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.