Merge main to main-vs-deps#57635
Merged
jinujoseph merged 120 commits intomain-vs-depsfrom Nov 12, 2021
Merged
Conversation
… function that needs to be addressed and C# code needs to be cleaned up and not look like it was written by VB programmer.
…/InlineTemporaryTests.vb Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…orsTests.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…nuationTests.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…nuationTests.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
…nuationTests.cs Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
Co-authored-by: Sam Harwell <sam@tunnelvisionlabs.com>
… and in C# return false for first and correct value for second but its not used.
…pening and always return false in C#. The C# function is never called.
…r for C# can just return false.
…926.2 Microsoft.Net.Compilers.Toolset From Version 4.0.0-5.21469.2 -> To Version 4.0.0-5.21476.2
…001.19 Microsoft.Net.Compilers.Toolset From Version 4.0.0-5.21469.2 -> To Version 4.0.0-5.21501.19
…007.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21507.3
…008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21508.1
…008.3 Microsoft.Net.Compilers.Toolset From Version 4.0.0-5.21469.2 -> To Version 4.0.0-5.21508.3
…011.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21511.1
…012.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21512.3
…013.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21513.5
…014.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21514.3
…015.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21515.2
…015.3 Microsoft.Net.Compilers.Toolset From Version 4.0.0-5.21469.2 -> To Version 4.0.0-6.21515.3
…018.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21518.1
Merge release/dev17.1 to main
Fix issues in compilation tracker reported in prior PR
Add editor features + rename tracking code action to telemetry table
…109.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21555.2 -> To Version 7.0.0-beta.21559.3
c914bdd to
d31b906
Compare
Don't throw when delay is expedited in tests
Don't suggest simplification for positional patterns
Only offer nullable reference types for C# 8 and newer
Cleanup how we create skeleton assemblies.
Member
|
@allisonchou I guess we have real integration test breaks in this one. Roslyn.VisualStudio.IntegrationTests.CSharp.CSharpBuild.BuildWithCommandLine Are failing consistently on each run. |
…b3-abaf7597957f [main] Update dependencies from dotnet/arcade
d31b906 to
675ae72
Compare
|
Apologies, while this PR appears ready to be merged, it looks like |
1 similar comment
|
Apologies, while this PR appears ready to be merged, it looks like |
This was referenced Nov 12, 2021
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
16 participants
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 main into main-vs-deps.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/main-to-main-vs-deps git reset --hard upstream/main-vs-deps git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-main-vs-deps --force