Merges/merge release/dev16.9 to release/fcs #11004
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
Merge main to release/dev16.9
Merge main to release/dev16.9
#9490 - Update error message placeholders to format error message correctly - Converted count up to count down to show properly how many more elements were requested but not fulfilled
Co-authored-by: Phillip Carter <pcarter@fastmail.com>
Merge main to release/dev16.9
Merge main to release/dev16.9
Merge main to release/dev16.9
Merge main to release/dev16.9
* Update dependencies from https://github.com/dotnet/arcade build 20201111.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20561.5 * Update dependencies from https://github.com/dotnet/arcade build 20201113.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20563.2 * Update dependencies from https://github.com/dotnet/arcade build 20201116.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20566.3 * Update dependencies from https://github.com/dotnet/arcade build 20201117.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20567.7 * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain older sdk * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain 3.1 SDK Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brett V. Forsgren <brettfo@microsoft.com>
* Initial incremental build refactor * Get previous slot * Fixed build * Fixed timestamp max * Updating surface area * Fixing last test * Just return true * Add minor TODO * Change value name to something more coherent * Fixing test
Merge main to release/dev16.9
Merge main to release/dev16.9
…r of type `string`.
Merge main to release/dev16.9
Co-authored-by: Cristiano Suzuki <crsuzuki@microsoft.com>
Merge main to release/dev16.9
Fix version #
Cherry pick - Fix sdk refs (#10839)
Cherry pick into 16.9 - Fixed find all references on properties
* Backing out stackoverflow fix by delayed gen methods * Trying to lazily gen IL * Making ILMethodBody.IL be lazy * Consolidating lazy methodbodies by removing ILLazyMethodBody * Updating baseline and fixing build * Minor change
Cherry Pick into 16.9 - Stack-overflow fix (#10868)
[release/dev16.9] update target insertion branch
* Update sdk version * sig
Co-authored-by: Cristiano Suzuki <crsuzuki@microsoft.com>
Cherry Pick into 16.9 - Track the signaturehelp session kind in signature help (#10970)
Cherry pick Rename netcoreapp5.0
cartermp
approved these changes
Feb 3, 2021
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.
To update merge:
git checkout merges/merge-release/dev16.9-to-release/fcs git reset --hard upstream/release/fcs git merge upstream/release/dev16.9 # make any edits or additional commits here git push upstream merges/merge-release/dev16.9-to-release/fcs --force