Merge main to dev17.0 #872
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
…414.5 (#786) [main] Update dependencies from dotnet/arcade
…415.5 (#788) [main] Update dependencies from dotnet/arcade
…416.2 (#792) [main] Update dependencies from dotnet/arcade
…419.2 (#795) [main] Update dependencies from dotnet/arcade
…420.2 (#798) [main] Update dependencies from dotnet/arcade
…421.1 (#799) [main] Update dependencies from dotnet/arcade
…422.1 (#800) [main] Update dependencies from dotnet/arcade
Migrate to OneLocBuild
…428.3 (#804) [main] Update dependencies from dotnet/arcade
…429.1 (#807) [main] Update dependencies from dotnet/arcade
…430.2 (#808) [main] Update dependencies from dotnet/arcade
Dispose workspaces at the end of RunAsync
…503.2 (#810) [main] Update dependencies from dotnet/arcade
[main] Update dependencies from dotnet/arcade
…506.13 (#813) [main] Update dependencies from dotnet/arcade
…507.5 (#814) [main] Update dependencies from dotnet/arcade
…510.1 (#815) [main] Update dependencies from dotnet/arcade
…511.6 (#817) [main] Update dependencies from dotnet/arcade
Enable Arcade v3 publishing
…513.1 (#819) [main] Update dependencies from dotnet/arcade
…513.5 (#821) [main] Update dependencies from dotnet/arcade
…514.2 (#822) [main] Update dependencies from dotnet/arcade
Fix support for multiple languages in AdditionalProjects
Support TrySelectDiagnosticToFix for Fix All operations
Only require code fix for first iteration
Show differences when only end-of-line changes
update versions to 1.1.1
Add ReferenceAssemblies.Net.Net60
Added closing slash to analyzer reference XML
This version offers an IChunker interface that eliminates the need to reimplement IDiffer entirely. Since the IDiffer interface also changed for the 1.5.0 release, this change avoids errors for users who try to update this dependency in downstream projects.
Update to DiffPlex 1.5.0
Update the component debugger to work in the new launch profiles format introduced in VS2022. See https://github.com/dotnet/project-system/blob/main/docs/repo/property-pages/how-to-add-a-new-launch-profile-kind.md for reference. Removes the old user control, and writing code which is now handled by the rule file (ComponentDebuggerLaunchProfile.xaml). Adds rule exporting and ProvideCodeBase so that VS can find the rule and apply it to matching projects. Tested on VS2022 using an existing launchsettings.json and confirmed projects show the new UI, and can add/remove as needed
|
/azp run |
|
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
jmarolf
force-pushed
the
merges/main-to-dev17.0
branch
from
9bc37b2 to
57470e3
Compare
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 main into dev17.0.
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 merges/main-to-dev17.0 git reset --hard upstream/dev17.0 git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-dev17.0 --force