Commit graph

9092 commits

Author SHA1 Message Date
Nate McMaster
ba8e18dac7
Fix #4139 - escape quoted strings for process start 2018-03-20 16:53:42 -07:00
Livar
c91ab95952
Merge pull request #8853 from livarcocc/update_nuget
Updating NuGet to 4.6.1-rtm-5019
2018-03-20 15:56:43 -07:00
William Li
48605d1c98 Merge branch 'master' into merges/release/2.1.3xx-to-master 2018-03-20 15:26:48 -07:00
Livar Cunha
58703f72ae Updating the branding of the CLI to 2.1.103. 2018-03-20 14:29:43 -07:00
Livar Cunha
f557859feb Updating NuGet to 4.6.1-rtm-5019 2018-03-20 14:22:54 -07:00
Tom Meschter
0bd52412cc
Merge pull request #8799 from v-zbsail/loc_20180312_master
LOC CHECKIN | cli master | 20180315
2018-03-20 09:55:41 -07:00
William Lee
9cc2b7cd2f
Change --source to --source-feed and make it additional (#8833)
Other than change source to source-feed and make it additional instead of exclusive. I changed source to be multiple. Because restore support multiple source https://github.com/Microsoft/dotnet/issues/361

As for mock. The offline feed and source feed is considered the same, so remove the category of “source”. I renamed source to “AdditionalFeed” because that is more accurate on implementation level.

Note:
NuGet feed don’t have order. Whichever responses the fastest, is the first.
No change on restore.

scripts/cli-test-env.sh change is due to mac 10.13 is finally added to RID graph. And it is “considered” one of the CLI supported RID
2018-03-19 22:22:45 -07:00
Nate McMaster
fe6d6fa95e
Generate Microsoft.NETCoreSdk.BundledCliTools.props 2018-03-19 14:29:20 -07:00
Peter Huene
4343118151
Merge pull request #8753 from natemcmaster/master
Fix #4139 - escape quoted strings for process start
2018-03-19 14:25:31 -07:00
Peter Huene
b5510aea43
Update translations following merge with conflicts.
Updating translation status for resource strings that changed upstream.
2018-03-19 14:00:57 -07:00
Zbyněk Sailer
f033eacd5a
LOC CHECKIN | cli master | 20180315 2018-03-19 13:59:44 -07:00
Livar
6eea994e69
Merge pull request #8843 from livarcocc/update_branding
Updating the CLI branding to 2.1.300-preview3.
2018-03-19 11:24:33 -07:00
Livar
892cb5248b
Merge pull request #8828 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62717-01
2018-03-19 11:24:20 -07:00
Livar Cunha
c5e58ee5f4 Updating the CLI branding to 2.1.300-preview3. 2018-03-19 09:50:31 -07:00
John Beisner
f6bd0065ea
Merge pull request #8827 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-19 09:19:49 -07:00
Peter Huene
ec3bdf693c
Merge pull request #8830 from peterhuene/list-tool-path
Implement the --tool-path option for list tool command.
2018-03-19 08:36:51 -07:00
Peter Huene
95c0359d26
Implement the --tool-path option for the list tool command.
This commit implements the missing `--tool-path` option for the list tool
command.  This enables the command to list locally installed tools.

Fixes #8803.
2018-03-16 20:13:25 -07:00
Peter Huene
d3244e8ef0
Ensure tool package store root is a full path.
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.
2018-03-16 20:13:25 -07:00
Livar
bca991fddb
Update SDK to 2.1.200-preview-62717-01 2018-03-16 17:57:25 -07:00
Livar
512aefa43a
Merge pull request #8811 from dotnet/update_sdk
Update SDK to 2.1.200-preview-62715-08
2018-03-16 17:34:31 -07:00
Livar
67c4562f43
Merge pull request #8822 from livarcocc/merge_master_3xx
Merge master into release/2.1.3xx
2018-03-16 17:32:30 -07:00
William Lee
04ba0c9523
Better using facing string (#8809)
Fix #8728

Fix #8369
2018-03-16 17:00:14 -07:00
John Beisner
470acd8abe
Alpine fix; plus 1 (#8821)
* The '-n' option to 'cp' does not exist for Alpine; don't use "$ID.$VERSION_ID" for the error message.

* Try "cp -R -u"  for alpine variants.

* Fixing a comment...
2018-03-16 16:26:56 -07:00
Peter Huene
6edbaea80d
Merge pull request #8807 from peterhuene/fix-list-tool-command-tests
Fix list tool command tests to be localizable.
2018-03-16 15:06:59 -07:00
Livar
e2c3f7e3d4
Updating the SDK to 2.1.200-preview-62716-06. 2018-03-16 13:32:07 -07:00
Livar
005f87257a
Merge pull request #8810 from dotnet/prkrishn/update-versions
Update AspNetCore package versions to 2.1.0-preview2-30338
2018-03-16 10:41:15 -07:00
Livar
91c50b56a0
Merge pull request #8813 from dotnet/nguerrera/insert-sdk
Update dotnet/sdk to latest
2018-03-16 10:40:58 -07:00
Livar
eeca22fc71
Updating the SDK to 2.1.200-preview-62716-04 2018-03-15 21:23:22 -07:00
William Lee
3f09a889d9
Update tool (#8794) 2018-03-15 19:45:11 -07:00
Nick Guerrera
fb093499f0
Update dotnet/sdk to latest
Includes fast ResolvePackageAssets
2018-03-15 18:37:39 -07:00
William Lee
3d13658f97 Update SDK to2.1.300-preview2-62715-07 (#8808) 2018-03-15 18:36:48 -07:00
Livar
b0acac94b8
Update SDK to 2.1.200-preview-62715-08 2018-03-15 17:08:38 -07:00
Pranav K
d5894edefa
Update AspNetCore package versions to 2.1.0-preview2-30338 2018-03-15 16:20:14 -07:00
Peter Huene
30caede284
Fix list tool command tests to be localizable.
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.
2018-03-15 15:52:54 -07:00
Livar
680e72993b
Merge pull request #8795 from natemcmaster/aspnetcore-alpine
Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux
2018-03-15 14:23:20 -07:00
John Beisner
2a63f9e76c
Merge pull request #8788 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-15 13:15:51 -07:00
John Beisner
123df7f386
Follow-up PR for Linux-arm; CLI:master (#8797)
* Fix the badge for Linux-arm.

* Add comment for the LZMA; turn off displaying of test results for arm*
2018-03-15 12:30:11 -07:00
John Beisner
a54f0ffb81
Enable 'arm' builds in the CLI (#8791)
* First draft enablement of Win-arm and Linux-arm builds for the CLI.

* Fixing a typo

* Disable tests for arm; enable badges and FinalizeBuild for arm.

* Remove the 'Win-arm' leg.

* Update the README

* Update the README [2]

* Update netci.groovy

* Fixing a hard-coded Architecture: 'linux-x64'; removing the LZMA for 'arm'.
2018-03-14 19:04:25 -07:00
Nate McMaster
c257087ca6 Upgrade to aspnetcore 2.1.0-preview2-30331 and pull aspnetcore for Alpine Linux 2018-03-14 16:47:59 -07:00
Livar
06ce7628d3
Merge pull request #8786 from livarcocc/merge_release_211xx_into_release_212xx
Merge release/2.1.1xx into release/2.1.2xx
2018-03-13 21:01:00 -07:00
Livar
8fd0e7317d
Updating Roslyn to 2.8.0-beta2-62713-11 2018-03-13 20:26:51 -07:00
Livar Cunha
b87e9521cd Merge branch 'release/2.1.1xx' into merge_release_211xx_into_release_212xx
* release/2.1.1xx: (21 commits)
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  Build trigger commit.
  Update to consume aspnetcore 2.0.6-10008 notimestamp build
  Update to consume aspnetcore 2.0.6-10008 timestamp build
  Updating the templates version to 1.0.0-beta3-20171117-314. We had it at an older version by mistake.
  Making a document only commit to trigger another build of the CLI.
  Add 2.0.5 ASP.NET store to native installers.
  Update to consume aspnetcore 2.0.6-10007
  Fix Windows servicing builds.
  Updating the SDK dependency to 15.5.0-preview-62518-04 to fix the signing issue
  Update runtime and branding to 2.0.6.
  ...

 Conflicts:
	build/Branding.props
	build/DependencyVersions.props
	build/NugetConfigFile.targets
	build/Version.props
	packaging/osx/clisdk/resources/cs.lproj/conclusion.html
	packaging/osx/clisdk/resources/de.lproj/conclusion.html
	packaging/osx/clisdk/resources/en.lproj/conclusion.html
	packaging/osx/clisdk/resources/es.lproj/conclusion.html
	packaging/osx/clisdk/resources/fr.lproj/conclusion.html
	packaging/osx/clisdk/resources/it.lproj/conclusion.html
	packaging/osx/clisdk/resources/ja.lproj/conclusion.html
	packaging/osx/clisdk/resources/ko.lproj/conclusion.html
	packaging/osx/clisdk/resources/pl.lproj/conclusion.html
	packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
	packaging/osx/clisdk/resources/ru.lproj/conclusion.html
	packaging/osx/clisdk/resources/tr.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
	packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
	packaging/windows/clisdk/bundle.wxl
2018-03-13 20:23:33 -07:00
Livar
8d409357db
Merge pull request #8785 from dotnet/update_sdk
Updating the SDK version to 2.1.100-preview-62714-01
2018-03-13 20:16:10 -07:00
Livar
7d338430b3
Merge pull request #8784 from livarcocc/update_branding_to_102
Updating the branding of the CLI to 2.1.102.
2018-03-13 20:15:54 -07:00
Livar
6d9177f143
Merge pull request #8770 from livarcocc/re_enable_template_test
Re-activate templating test.
2018-03-13 18:11:23 -07:00
Livar
a662fda7aa
Merge pull request #8783 from dotnet/update_roslyn
Update Roslyn to 2.7.0-beta3-62707-11
2018-03-13 18:10:10 -07:00
Livar
2e7d92be25
Updating the SDK version to 2.1.100-preview-62714-01 2018-03-13 18:09:31 -07:00
Livar Cunha
80978d689b Updating the branding of the CLI to 2.1.102. 2018-03-13 18:05:41 -07:00
Peter Huene
8444cb04b5
Merge pull request #8781 from peterhuene/msrc-merge
Merge release/2.1.1xx-MSRC to release/2.1.1xx
2018-03-13 17:34:13 -07:00
Peter Huene
b724d8be12
Remove cli-deps from sources.
This commit removes cli-deps from sources.
2018-03-13 16:59:13 -07:00