[automated] Merge branch 'release/2.1' => 'main' #30797
Merged
Conversation
This file contains 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
- patched in this release
Will also get S.T.E.W included in the Shared Framework
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)
- need more assemblies in `--TestAdapterPath` command-line argument
[2.1] Update baseline and SDK - dotnet/aspnetcore-internal#3781
dotnet-maestro-bot
requested review from
halter73,
jkotalik,
Tratcher and
a team
as code owners
dotnet-maestro-bot
force-pushed
the
merge/release/2.1-to-main
branch
from
6a670c2 to
cea1fe3
Compare
ghost
added
area-infrastructure
- `_Pack` target failing in ProdCon builds - fortunately problem is specific to non-`IsFinalBuild` builds - don't add the version metadata because that's not written into package.lock - e.g. looking for aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12+pb-20210212-02.tgz - but `npm pack` actually wrote aspnet-signalr-protocol-msgpack-1.0.26-servicing-20210212.12.tgz - see https://dnceng.visualstudio.com/internal/_build/results?buildId=992921&view=logs&j=f31c9f97-4411-58e7-49ac-fc73f645e6b6&t=2bcaa12b-2f4b-5b1f-c519-10308f653190&l=3190
* Update README.md * Update README.md * Update PatchConfig.props
…otnet#30639) * Correct and streamline internal builds - correct manual internal builds - need to explicitly set `$(BuildNumber)` property in all build steps - rename `$(BuildScriptArgs)` to avoid circular reference - skip tests by default in internal non-PR builds nits: - include new `$(BuildNumberArg)` in `$(SharedFxArgs)` - run all test jobs in internal pull requests * Always skip tests in SharedFx and later jobs - however test\SharedFx.UnitTests\SharedFx.UnitTests.csproj always runs as part of `BuildSharedFx` target * Include transitive refs in meta-package .nuspec files - dotnet#30279 - ensure dependencies are up-to-date even when PatchConfig.props is empty - change only CoreFx and core-setup dependencies - also change transitive references that weren't mentioned before * Bump a few patch versions
- left 3 new transitive dependencies out of dotnet#30639
pranavkm
force-pushed
the
merge/release/2.1-to-main
branch
from
ff35557 to
e57d9e7
Compare
|
Hello @pranavkm! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
ghost
merged commit
dougbu
pushed a commit
to dougbu/razor-compiler
that referenced
this pull request
Nov 17, 2021
…rge/release/2.1-to-main [automated] Merge branch 'release/2.1' => 'main' Commit migrated from dotnet/aspnetcore@c2e6b32dc50d
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I detected changes in the release/2.1 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/2.1 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/2.1-to-main'. 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.