Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Merge master into release/2.1.3xx #9076

Merged
merged 97 commits into from
Apr 17, 2018

Conversation

livarcocc
Copy link

No description provided.

Nate McMaster and others added 30 commits March 8, 2018 15:50
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 dotnet#8799.
…tests

Fix list tool command tests to be localizable.
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.
Implement the --tool-path option for list tool command.
Updating the CLI branding to 2.1.300-preview3.
Updating translation status for resource strings that changed upstream.
Fix #4139 - escape quoted strings for process start
Update Roslyn to 2.8.0-beta3-62722-05
* 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 (dotnet#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 (dotnet#8809)
  Fix list tool command tests to be localizable.
  Fix #4139 - escape quoted strings for process start
  Generate Microsoft.NETCoreSdk.BundledCliTools.props
added in use info to the --version option
William Li and others added 20 commits April 10, 2018 15:42
If there are shims packaged by convention in nupkg. Shim Repository will simply copy it to the right location.

The query interface ToolPackageInstance will be in charge of finding the shim folder and filter the right RID. Shim Repository will pick the right file after the folder is located since Shim Repository knows the shim name and it also book keep the files at uninstallation.
During development, due to the wrong adapter level. The mock duplicated too much logic. So, I corrected the abstraction level to lower (only create shim). And replaced the existing mock with a much smaller one without any atomic control and file move, copy logic. At the same time. The chmod, which is a IO action, causes problem during tests. So I added adapter layer to it and put it in Util.
…preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively
…ependencies

Update coresetup, coresetup, coresetup, roslyn to preview3-26411-06, preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively (master)
…et#9049)

* Terminate the 'StartsWith' string in the badge existence check.

* Replace "string.Concat"
Insert NuGet Build 4.7.0-rtm.5081 into cli
LOC CHECKIN | dotnet/cli master | 20180409
Trim back the 'unnecessary' nuget feeds
* master: (49 commits)
  Add back 'nuget-build' feed for: NuGet.Versioning 4.7.0-rtm.5081
  Slight re-ordering...
  Add back 'Roslyn' feed for: Microsoft.NETCore.Compilers 2.8.0-beta4-62811-05
  Trim back the 'unnecessary' nuget feeds.
  Insert NuGet Build 4.7.0-rtm.5081 into cli
  Terminate the 'StartsWith' string in the badge existence check. (dotnet#9049)
  Update coresetup, coresetup, coresetup, roslyn to preview3-26411-06, preview3-26411-06, preview3-26411-06, beta4-62811-05, respectively
  consume bring your own shim(byos) (dotnet#9018)
  Fixing typos...
  Updating the dev-certs message displayed in the first run experience.
  Fix merge to only update core-setup and Roslyn versions.
  LOC CHECKIN | dotnet/cli master | 20180409
  Add TryGetMostFitRuntimeIdentifier (dotnet#8997)
  Adapt to no config file Apphost shim
  Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26406-06, preview3-26406-06, preview3-26406-06, beta4-62806-08, respectively
  Revert links on Readme to master
  Add test cases per PR feedback
  Tweak --no-build messages based on PR feedback
  Update CoreSetup, CoreSetup, CoreSetup, Roslyn to preview3-26405-02, preview3-26405-02, preview3-26405-02, beta4-62805-01, respectively
  Disabling msbuild node reuse for CLI full build.
  ...

 Conflicts:
	build/DependencyVersions.props
@livarcocc livarcocc added this to the 2.1.3xx milestone Apr 16, 2018
@livarcocc livarcocc requested a review from a team April 16, 2018 19:02
@wli3
Copy link

wli3 commented Apr 16, 2018

@dotnet-bot test OSX10.12 x64 Release Build

Copy link

@wli3 wli3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had one round of check, focus on branding. Looks like no "master" in wrong place. preview2 do not need to change, so that is easy

@dsplaisted
Copy link
Member

@wli3 You need this commit: 665daa0

@livarcocc livarcocc merged commit bc83d98 into dotnet:release/2.1.3xx Apr 17, 2018
@livarcocc livarcocc deleted the merge_master_into_3xx branch April 17, 2018 15:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.