Skip to content

[2.1] Update baseline and SDK #30779

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

Jump to bottom
Merged
merged 10 commits into from
Mar 10, 2021
Merged

[2.1] Update baseline and SDK #30779

merged 10 commits into from
Mar 10, 2021

Conversation

JunTaoLuo
Copy link
Contributor

dougbu and others added 8 commits February 12, 2021 21:12
@dougbu
Merged PR 12859: [release/2.1] Unpin System.Text.Encodings.Web
8f59b0c 
- patched in this release
@dotnet-bot
Merge in 'release/2.1' changes
6111c2e
@wtgodbe
Merged PR 13056: Patch packages that depend on System.Text.Encodings.Web
604efe7 
Will also get S.T.E.W included in the Shared Framework
@wtgodbe
Merged PR 13057: Add direct reference to S.T.E.W for Razor test projects
f7e5194 
Should fix reference resolution errors in Razor SDK projects. As far as I can tell this is the only external reference we need to add here (other references are to projects in the repo)
@wtgodbe
Reference .dll directly
2e56411
@wtgodbe
Merged PR 13067: Try setting metadata for S.T.E.W
013de63
@dotnet-bot
Merge in 'release/2.1' changes
62e2742
Update baseline and SDK
bdd5c49
@JunTaoLuo JunTaoLuo requested review from dougbu and wtgodbe March 9, 2021 18:23
@JunTaoLuo JunTaoLuo requested a review from a team as a code owner March 9, 2021 18:23
@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Mar 9, 2021
dougbu
dougbu suggested changes Mar 9, 2021
View reviewed changes
@JunTaoLuo JunTaoLuo changed the base branch from main to release/2.1 March 9, 2021 18:44
@JunTaoLuo
Copy link
Contributor Author

@dougbu did we ever figure out how to fix the timeouts? If not I'm probably going to merge this as is.

@BrennanConroy
Copy link
Member

#30164 (comment)

@dougbu
Copy link
Contributor

dougbu commented Mar 9, 2021

@BrennanConroy's right. I recommend cherry-picking 5bafa2d into this PR. Makes more sense here than in #30164 anyhow.

@dougbu
Split UnitTests/net461 up more
2834542 
- need more assemblies in `--TestAdapterPath` command-line argument
@dougbu dougbu merged commit cea1fe3 into release/2.1 Mar 10, 2021
@dougbu dougbu deleted the johluo/2.1 branch March 10, 2021 03:09
@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Jun 10, 2021
@dougbu dougbu added this to the 2.1.27 milestone Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbu dougbu dougbu approved these changes

@wtgodbe wtgodbe wtgodbe approved these changes

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework tell-mode Indicates a PR which is being merged during tell-mode
Projects
None yet
Milestone
2.1.27
Development

Successfully merging this pull request may close these issues.
6 participants
@JunTaoLuo @BrennanConroy @dougbu @wtgodbe @Pilchie @dotnet-bot