Commit graph

2858 commits

Author SHA1 Message Date
Livar Cunha
5e5b4de0b9 Do no pass down to implicit restore the framework option. 2017-06-13 19:25:23 -07:00
Nick Guerrera
419562ba95 Make dotnet-help.Tests pass on localized setup 2017-06-13 19:24:30 -07:00
Nick Guerrera
6e0cfa7839 Make dotnet-msbuild.Tests pass on localized setup 2017-06-13 19:05:16 -07:00
Nick Guerrera
38e5b7123a Make Sln.Internal.Tests pass on localized setup 2017-06-13 18:22:41 -07:00
Nick Guerrera
f09124fcd6 Make dotnet.Tests pass on localized setup 2017-06-12 17:31:40 -07:00
Nick Guerrera
a2a33591ce Merge branch 'release/2.0.0' into loc 2017-06-12 15:06:54 -07:00
Daniel Plaisted
9659749eeb Update version of SDK and MS.NET.Build.Extensions, adapt to layout change 2017-06-09 18:18:55 -07:00
Nick Guerrera
bbdbbb3e8d Update XLF 2017-06-09 10:38:28 -07:00
Nick Guerrera
31c5294ef5 Merge branch 'release/2.0.0' into loc 2017-06-09 10:30:29 -07:00
Daniel Plaisted
6b44f8938b Merge upstream changes 2017-06-09 00:43:29 -07:00
Daniel Plaisted
858e443b1e Don't try to CrossGen .NET Framework support DLLs 2017-06-09 00:38:36 -07:00
Livar Cunha
0b19d6889e Updating the vstest.console to use the same runtime that is shipping with the CLI. 2017-06-08 16:45:29 -07:00
Livar Cunha
c89618603a Changing the parser description for commands that have implicit restore. 2017-06-07 23:15:36 -07:00
Nick Guerrera
dfc03e7f2c Build localized satellite assemblies 2017-06-07 20:22:27 -07:00
Livar Cunha
3231295acf Fixing a bug in the restore option where specifying verbosity through /v was not entirely honored.
Adding tests for implicit restore for all the affected commands.

Fixing an issue where the command target was being passed to the restore command during implicit restore.

Adding restore params to all commands with implicit restore. Also, implicitly set the restore output to quiet.

Adding tests for the no-restore option.
2017-06-07 17:41:30 -07:00
Livar Cunha
dd76fec564 Implicit restore for build, pack, publish, run and test. 2017-06-07 17:39:29 -07:00
Daniel Plaisted
3a61ba1d20 Add Microsoft.NET.Build.Extensions and corresponding DLLs in CLI layout 2017-06-07 17:27:34 -07:00
Nick Guerrera
14028c92dd Update xlf files 2017-06-07 16:56:09 -07:00
Nikolche Kolev
d1e7e3d77d Add force restore option 2017-06-07 11:48:40 -07:00
Nick Guerrera
132f70c5e0 Convert LocalizableStrings.cs to resx 2017-06-06 21:50:58 -07:00
Kevin Ransom
682eb7a37f chmod RunFsc.sh on unix 2017-06-01 20:14:09 -07:00
Kevin Ransom
2cfad18b0b This updates the F# compiler to the latest nuget published build. 2017-06-01 17:38:20 -07:00
Livar
413fa23eee Merge pull request #6731 from livarcocc/merge_rel_110
Merge rel/1.1.0 into release/2.0.0
2017-06-01 11:54:16 -07:00
Livar Cunha
5c6e7daca9 Updating NuGet. 2017-06-01 10:23:53 -07:00
Livar Cunha
f4bb13acaa Merge branch 'rel/1.1.0' into merge_rel_110
* rel/1.1.0: (41 commits)
  Updating the Sdk to one that includes the error surfacing work.
  Update NuGet to 4.3.0-preview2-4082
  Update NuGet to 4.3.0-preview1-4081 and SDK to corresponding 1.1.0 based version
  Updating MSBuild to 15.3.0-preview-000246-05 to match VS.
  Updating the global.json creation to use the IFile interface and adding a unit test to cover it.
  Making restore use a config file so that it does not use fallback folders that may exist in the machine.
  Dropping a global.json when running the first run experience with a version that matches the version of the CLI being used in the command that triggered the first run.
  Updating the websdk version for 1.0
  Trying to fix the opensuse42 test failure, where we tried to invoke a tool that target 1.0.4 where the 1.0 runtime is not available.
  Pinning the stage0 to the last build out of rel/1.0.1 and adding a project to download 1.0 dependencies for test assets.
  Updating the branding to rel/1.1.0
  Dummy commit.
  Adding the access token to the lzma url.
  Dummy change to force a build.
  Reverting the msbuild version to the release version.
  Adding the web feed to nuget.config, as some packages failed to mirror and we need a build ASAP.
  Updating the msbuild, SDK and Web SDK versions.
  Dummy commit to kick off the build.
  the FSharp.NET.Sdk version `-bundled` contains only the Sdk dir
  bump f# sdk package version
  ...
2017-06-01 09:43:31 -07:00
mlorbetske
1d1f848611 Remove redundant error handling from project provider, add a better message for deserialization exceptions 2017-06-01 09:38:43 -07:00
Mike Lorbetske
052caa560c Add missing using directive 2017-05-31 23:31:46 -07:00
Mike Lorbetske
68f2d17034 Only catch JsonException in the method that dispatches to the appropriate handlers 2017-05-31 23:15:56 -07:00
mlorbetske
bcb12a69f4 Fix flow from the refactoring 2017-05-31 23:15:56 -07:00
mlorbetske
85870a711e Remove NuGet.Configs, add inversion of the launch profile flag, move profile application logic to its own method 2017-05-31 23:15:56 -07:00
mlorbetske
fc8428681e Make errors more specific, add support for setting the launch URL for ASP.NET apps 2017-05-31 23:15:56 -07:00
Mike Lorbetske
265da2064d Ad tests, fix issue where profile not found isn't an error 2017-05-31 23:12:49 -07:00
Mike Lorbetske
2e100f7ed8 Initial add of launchSettings.json support 2017-05-31 23:12:49 -07:00
mlorbetske
20de0334e7 Re-enable telemetry for new 2017-05-31 11:40:30 -07:00
Livar
82fcc4344d Merge pull request #6715 from nguerrera/localization
Localization handback
2017-05-30 14:54:24 -07:00
Livar
6db5ff4638 Merge pull request #6690 from livarcocc/fix_verbosity_option_in_help
Changing verbose to verbosity in the help options
2017-05-30 14:53:58 -07:00
Livar Cunha
c27b89dfd4 Changing verbose to verbosity in the help options to match what we actually use. 2017-05-30 13:05:38 -07:00
Zbyněk Sailer
b479bd900d LOC CHECKIN | cli-master | 20170529 2017-05-30 11:19:00 -07:00
Livar
5a47e7db07 Merge pull request #6701 from nguerrera/resolver-fix
Allow resolution of SDKs without minimum msbuild version file
2017-05-27 10:02:56 -07:00
Nick Guerrera
7c8bf26eaf Allow resolution of SDKs without minimum msbuild version file 2017-05-26 15:06:55 -07:00
Livar Cunha
8b07dfa149 Adding the runtime identifier option to dotnet clean. 2017-05-25 12:29:51 -07:00
Livar Cunha
db68d4505e Pinning the MSBuild Minimum version to 15.3.0. 2017-05-24 19:28:26 -07:00
Livar Cunha
1a117568fe Addressing code review comments by comparing the versions differently and by changing the name of SDK to .NET Core SDK. 2017-05-24 18:00:05 -07:00
Livar Cunha
75eac0c92b Moving version validation to only when a SDK is not overriden. Also adding a validation for the minimum MSBuild version. 2017-05-24 18:00:05 -07:00
Livar Cunha
79a817bbc7 Fixing windows build and addressing code review comments. 2017-05-23 22:49:52 -07:00
Livar Cunha
5b3cd63198 Changing the resolver so that it will search for dotnet in the PATH instead of hard coded program files. 2017-05-23 22:49:52 -07:00
Livar
1465718fc4 Merge pull request #6641 from ellismg/update-roslyn-version
Move Roslyn to latest 15.3 version
2017-05-23 22:18:25 -07:00
Livar
96ff9a3223 Merge pull request #6646 from livarcocc/min_version_resolver
Add a min version check to the resolver
2017-05-23 22:17:42 -07:00
Matt Ellis
eb60245975 Update Roslyn to latest 15.3 version 2017-05-23 16:56:41 -07:00
Livar Cunha
3539fb2a77 Disabling net461 tests for the resolver. 2017-05-23 15:59:31 -07:00
Livar Cunha
37267bf158 Addressing code review comments and trying to fix the windows break. 2017-05-22 21:26:44 -07:00
mlorbetske
0dd30b92d5 Update to SetupCrossGen 121 - Coherence 25102 2017-05-22 11:48:30 -07:00
Livar Cunha
822b290bb6 Updating the global.json creation to use the IFile interface and adding a unit test to cover it. 2017-05-22 09:51:30 -07:00
Livar Cunha
f67a72d9c4 Making restore use a config file so that it does not use fallback folders that may exist in the machine. 2017-05-22 09:42:40 -07:00
Livar
0ddccc2922 Merge pull request #6638 from nguerrera/update-xlf
Run xlf converter
2017-05-20 21:41:46 -07:00
Kevin Ransom (msft)
cf9967bcd2 Add fsc to distribution (#6508)
* Add fsc to distribution

* update package

* Update compiler version

* I'm not sure these do anything usefull

* Reenable f# new project tests

* Revert "Reenable f# new project tests"

This reverts commit 34d294ec8c42145cf8cf0af166f9dfc8ee51b6f8.

* merge

* Update fsharp version

* Update compiler version

* Review feedback

* review feedback

* Update DependencyVersions.props
2017-05-19 23:20:19 -07:00
Livar Cunha
a4213f78e0 Adding more tests for the min version check in the resolver. 2017-05-19 22:40:11 -07:00
Livar Cunha
f61d1ffbb0 Adding a check for the min version in the CLI Resolver. 2017-05-19 21:42:05 -07:00
Livar
947c8daabc Merge pull request #6462 from nguerrera/sdk-resolver-tests
Better sdk resolver test
2017-05-19 21:40:56 -07:00
Livar Cunha
fd953738f0 Dropping a global.json when running the first run experience with a version that matches the version of the CLI being used in the command that triggered the first run. 2017-05-19 15:09:06 -07:00
Nick Guerrera
fca4162c10 Run xlf converter 2017-05-19 13:37:13 -07:00
Mardoxx
d019c19c3a Minor text fixes
NET Core -> .NET Core
2017-05-19 14:59:34 +01:00
Eric Erhardt
8c1dacbe23 Merge pull request #6631 from eerhardt/StoreOptions
Fix dotnet store options
2017-05-18 21:23:47 -05:00
William Li
88b2e06dd1 Merged host and SDK help
Change help according to https://github.com/dotnet/cli/issues/6215
2017-05-18 18:12:04 -07:00
Eric Erhardt
b44bce5786 Fix dotnet store options
- remove configuration
- remove preserve-working-dir
- add skip-symbols

Fix #6488
Fix #6489
Fix #6490
2017-05-18 18:23:54 -05:00
Livar
6647eddf24 Merge pull request #6627 from livarcocc/fix_restore_verbosity
Fixing restore so that it respects the verbosity param.
2017-05-18 15:39:05 -07:00
Livar Cunha
357fd3daf1 Fixing restore so that it respects the verbosity param. The problem was that ConsoleLoggerParameters was overwritting whatever was coming through the command line. 2017-05-18 14:13:01 -07:00
Livar
5407db04e4 Merge pull request #6623 from livarcocc/fix_runnable_message
Slight improvement to the not runnable message.
2017-05-18 11:56:23 -07:00
Livar
68246a46fa Merge pull request #6602 from livarcocc/json_perf_improvements
Improve Json perf by using JObject.Load.
2017-05-18 11:55:47 -07:00
Livar Cunha
cfd72bc1d0 Slight improvement to the not runnable message. 2017-05-18 11:14:38 -07:00
Livar Cunha
9952f2fd68 Addressing code review comments by using Streams instead of ing the contents into a string. 2017-05-18 10:07:19 -07:00
Livar Cunha
38fc8875f2 Enabling VB in the CLI.
Fixing the permissions for RunVbc.sh.
2017-05-17 22:16:22 -07:00
Livar Cunha
439c4e6173 Improve Json perf by using JObject.Load. 2017-05-17 21:09:49 -07:00
Livar
0401876ae0 Merge pull request #6594 from mikkelbu/error-message-when-missing-file-header-in-sln
Correct parsing of 'Format Version' header in sln files
2017-05-15 11:38:05 -07:00
Mikkel Nylander Bundgaard
80b293d4a6 Correct parsing of 'Format Version' header in sln files
Prior to this change the exception on line 138 could not
be thrown, as far as I can tell. The reason for this
is that`HeaderPrefix` contained a trailing space, and we
had verified that `line` (trimmed) started with
`HeaderPrefix`. Hence `line` must contain something more
than `HeaderPrefix` otherwise the tailing space would
have been removed, so the length of `line` could not be
less than or equal to the length of `HeaderPrefix`.

Added and changed tests to ensure that both exceptions
regarding `FormatVersion` are thrown.

Fixes #5978
2017-05-14 20:53:34 +02:00
Mikkel Nylander Bundgaard
05b0b64e55 Pass nologo to MSBuild in 'add package' command
Fixes #6534
2017-05-12 22:23:47 +02:00
Livar Cunha
477f0f42d0 Fixes a few inconsistencies in the display for the dotnet restore -help command.
Fixing tests based on the new strings.
2017-05-10 13:25:59 -07:00
Livar
976c997855 Merge pull request #6546 from livarcocc/fix_publish_help_output
Changing the order of the help text for dotnet publish
2017-05-09 14:22:52 -07:00
Livar
444d75c0cd Merge pull request #6526 from mikkelbu/fail-gracefully-when-multiple-project-exist
Fail gracefully when multiple projects exist
2017-05-08 15:33:22 -07:00
Livar Cunha
ad76052cb4 Changing the order of the help text for dotnet publish so that it matches the order from dotnet build as well. 2017-05-08 15:30:31 -07:00
Livar
760bdf8f75 Merge pull request #6530 from mikkelbu/gracefully-report-invalid-projects
Gracefully report invalid project when added via sln-add
2017-05-08 11:39:17 -07:00
Mikkel Nylander Bundgaard
7a824fe737 Gracefully report invalid project in sln-add
Fixes #5900
2017-05-06 02:08:00 +02:00
Nick Guerrera
071789b33f Merge branch 'release/2.0.0' into merge-release-2.0 2017-05-05 16:21:15 -07:00
Daniel Plaisted
10dd67baa8 Clean up tool restore framework fallback logic so there aren't multiple call sites to GetToolLockFile 2017-05-05 14:23:33 -07:00
Mikkel Nylander Bundgaard
de10e0dd54 Fail gracefully when multiple projects exist
Fixes #6267
2017-05-05 23:07:46 +02:00
Daniel Plaisted
8b13b3e579 Fall back to tools restored for .NET Core 1.x if they haven't been restored for .NET Core 2.0 2017-05-05 13:15:02 -07:00
Mike Lorbetske
209d05992f Disable telemetry for new 2017-05-05 01:44:24 -07:00
Mikkel Nylander Bundgaard
18d71a8471 Show help info when no or wrong arguments are given
Fixes #5383, fixes #5384
2017-05-04 01:01:35 +02:00
Livar Cunha
0dc1b53482 Switches the fallback folder under Nuget.Config to a package source, since we have issues for 1.0 apps using fallback folders. 2017-05-03 14:12:50 -07:00
Faizan2304
b90b191ef0 Insert Microsoft.TestPlatform.cli for update3 preview1 (#6420)
* Fix test issue failing with PathTooLongIssue

(cherry picked from commit 340254f7742201c74ed1a5c349bdca89113bd5dc)

* fix for issues:
1) https://github.com/Microsoft/vstest/issues/755
2) https://github.com/Microsoft/vstest/issues/687
3) https://github.com/Microsoft/vstest/issues/737

(cherry picked from commit 0e93b2a5d4734637538781fa5401ed81a31eea0f)

* use new version

* Update version

* Fix pathtoolong issue

* Fix test
2017-05-02 21:30:51 -07:00
Livar
e579548f81 Merge branch 'release/2.0.0' into NewAzurePackageStore 2017-05-02 14:27:20 -07:00
Livar
0560b1e546 Merge pull request #6463 from livarcocc/lzma_from_aspnet
Removing the code to generate the lzma archive
2017-05-02 14:26:11 -07:00
William Li
7154330432 Address code review
Use one version for cli migrate packages

as well as Nuget component packages

Rename CreateWithWith...
2017-05-02 13:26:46 -07:00
Nick Guerrera
1ef1cc5e27 Simplify test hook 2017-05-02 13:06:37 -07:00
Nick Guerrera
3cd4472495 Add dependency to test framework 2017-05-02 13:06:37 -07:00
Nick Guerrera
22b2e6a830 Prevent VS confusion 2017-05-02 13:06:37 -07:00
Nick Guerrera
e7ebe6d594 Add test hook 2017-05-02 13:06:37 -07:00
William Li
2ab4ac5454 Adjust for using cli-migrate package reference
Remove ProjectJsonMigration and its test from solution file

Change dependecy by package reference instead of project 2 project

Construct the sln and dotnet new with wrapper that is used in migrate
package

Add reference to Nuget ProjectModel etc since CrossGen need it and it
cannot automatically get the reference
2017-05-01 10:50:37 -07:00
William Li
093bf72c3c Remove ProjectJson solution and its tests
It is moved to cli-migration repo
2017-05-01 08:27:02 -07:00
John Beisner
a4aa850f6b Merge remote-tracking branch 'upstream/release/2.0.0' into NewAzurePackageStore 2017-04-28 16:23:02 -07:00