Merge master to master-vs-deps #34077
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
Have to disable quiet restore explicitly on local dev machines when doing a bootstrap build to work around this arcade issue: dotnet/arcade#2220
Merge dev16.0 to master
Fix local bootstrap build
Ref and out parameters with suppression should change the nullable state for the argument being suppressed. Moreover, the changes should flow through type inference. Closes #27743
Fixing false unresolvedConflict when renaming overloaded VB properties
we want to move to newer version of JsonRpc (2.x) from 1.x we use. but that has some complexity since version 2.x and 1.x is incompatible and we let partner to directly access Rpc exposed from ServiceHubServiceBase type. this is first step so that partners move to new API that doesn't expose JsonRpc directly. once they moved, moving us to new versino should be easier since we will not break partner teams.
* Update dependencies from https://github.com/dotnet/arcade build 20190308.5 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19158.5 * Update dependencies from https://github.com/dotnet/arcade build 20190309.2 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19159.2 * Update dependencies from https://github.com/dotnet/arcade build 20190310.1 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19160.1 * Update dependencies from https://github.com/dotnet/arcade build 20190310.2 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19160.2 * Update dependencies from https://github.com/dotnet/arcade build 20190311.14 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19161.14
ghost
merged commit
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.
This is an automatically generated pull request from master into master-vs-deps.
git fetch --all git checkout merges/master-to-master-vs-deps git reset --hard upstream/master-vs-deps git merge upstream/master # Fix merge conflicts git commit git push upstream merges/master-to-master-vs-deps --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.