This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merge release/2.1.3xx to master #8882
Merged
Conversation
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
Currently the list tool command tests, while localizing the column headers, didn't properly take into account the fact that localized builds might produce strings longer than the English versions of the column header strings. This results in a mismatch of the actual from the expected due to additional column padding. The fix is to stop using a static expected table and do a simple calculation of the expected table based on the length of the localized strings. Fixes issue related to PR #8799.
Fix #8728 Fix #8369
This commit fixes the tool package store such that it stores a full path instead of, potentially, a relative path. This prevents a relative path from inadvertently being passed to NuGet during the restore and causing it to restore relative to the temp project directory. Fixes #8829.
This commit implements the missing `--tool-path` option for the list tool command. This enables the command to list locally installed tools. Fixes #8803.
Updating translation status for resource strings that changed upstream.
Cherry-pick commits from master to release/2.1.3xx
dotnet install tool -> dotnet tool install dotnet uninstall tool -> dotnet tool uninstall dotnet list tool -> dotnet tool list dotnet update tool -> dotnet tool update
Generate Microsoft.NETCoreSdk.BundledCliTools.props
Updating the runtime to 2.1.0-preview2-26314-02
This commit ensures the correct property (`ProjectTypeGuids`) is respected when adding a project to a solution file. Additionally, we now error if a project type GUID cannot be determined rather than incorrectly mapping to the C# project type. Enabled previously disabled tests that were waiting on upstream changes from MSBuild and F#. Fixes #5131. Fixes #7742.
Fix project type GUIDs when adding projects to solution files.
…fAspNetUrlsForLaunchSettings Update launch settings for ApplicationUrl handling
peterhuene
force-pushed
the
merges/release/2.1.3xx-to-master
branch
from
dcb4fa1 to
2be8b43
Compare
* upstream/release/2.1.3xx: Try shorter test names Fix project type GUIDs when adding projects to solution files. Updating the runtime to 2.1.0-preview2-26314-02 Remove runtime identifiers from the test project Update launch settings for ApplicationUrl handling Change command order for tools (#8862) Update translations following merge with conflicts. LOC CHECKIN | cli master | 20180315 Implement the --tool-path option for the list tool command. Ensure tool package store root is a full path. Better using facing string (#8809) Fix list tool command tests to be localizable. Fix #4139 - escape quoted strings for process start Generate Microsoft.NETCoreSdk.BundledCliTools.props
peterhuene
force-pushed
the
merges/release/2.1.3xx-to-master
branch
from
2be8b43 to
1129267
Compare
peterhuene
approved these changes
Mar 23, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 release/2.1.3xx into master.
git fetch --all git checkout merges/release/2.1.3xx-to-master git reset --hard upstream/master git merge upstream/release/2.1.3xx # Fix merge conflicts git commit git push merges/release/2.1.3xx-to-master --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.