Commit graph

2858 commits

Author SHA1 Message Date
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
Livar Cunha
cc9819ed93 Removing the code to generate the lzma archive and instead download it from the asp.net location. 2017-04-28 15:45:29 -07:00
Nick Guerrera
09dd14bfe4 Fix some comments and add missing space to error message 2017-04-28 10:37:20 -07:00
Livar Cunha
50c7b1e9b6 Copying the aspnet runtime store artifacts to stage2. 2017-04-28 00:10:19 -07:00
Nick Guerrera
fa4fe3b2c6 Package MSBuild SDK resolver in VS insertion nupkg 2017-04-27 23:07:19 -07:00
Nick Guerrera
77ab1c5857 Add option to skip LZMA build 2017-04-27 23:07:18 -07:00
Nick Guerrera
d26b41a0c3 Add msbuild sdk resolver 2017-04-27 23:07:18 -07:00
Daniel Plaisted
811bb94de8 If generating deps.json fails, show MSBuild output in verbose output 2017-04-27 09:30:41 -07:00
Daniel Plaisted
d471037ce3 Show error if tools package doesn't include runtimeconfig file
For test assets, don't explicitly include the runtimeconfig file, as the pack command does it automatically
2017-04-27 09:30:41 -07:00
Daniel Plaisted
0afd0b9975 Remove dead code 2017-04-27 09:30:40 -07:00
Daniel Plaisted
cc9e942ede Apply code review feedback 2017-04-27 09:30:40 -07:00
Daniel Plaisted
8615c30063 Don't roll prefercliruntime tools forward across major versions of .NET Core 2017-04-27 09:30:38 -07:00
Daniel Plaisted
5c679cd32e Test fixes for tools deps.json generation 2017-04-27 09:29:16 -07:00
Daniel Plaisted
fa51bb43fc Call into project in .NET SDK to create deps.json files for tools instead of doing so directly 2017-04-27 09:29:16 -07:00
Jon Sequeira
74af357f07 fix NullReferenceError on remove package and incorrect help text 2017-04-26 16:43:55 -07:00
William Li
de0c37a48c Remove accidental debug line 2017-04-23 14:13:19 -07:00
William Li
da398658dc Localization for CommonOptions 2017-04-23 14:13:11 -07:00
Ankit Mishra
e36f518d63 Improving add package performance by removing extra dg spec files 2017-04-19 10:48:48 -07:00
Livar
2a00911b1f Merge pull request #6324 from eerhardt/Fix6244
Rename publish --target to --manifest.
2017-04-14 20:37:04 -07:00
Mike Lorbetske
645bb43291 Hook 'new' into the CLI telemetry pipeline 2017-04-14 20:32:51 -07:00
Eric Erhardt
bfab25c259 Rename publish --target to --manifest.
Fix #6244
2017-04-14 16:08:32 -05:00
William Li
def4322783 Fix format 2017-04-14 10:35:36 -07:00
William Li
83f3a3ec86 Fix dotnet run double dash passing arguments
When run “dotnet run -- foo”, foo should be the argument passed to the
subject app. After replacing the original parser, dotnet-run did not
utilize the “unparsedtoken” of the parsed result.

To append unparsedtoken to RunCommand’s argument is not straight
forward. RunCommand has an “immutable constructor”, which is a good
thing, so I made update RunCommand’s argument following the immutable
pattern -- create a new object with the original field but only change
the arguments. I also made these filed private set.
2017-04-13 16:56:57 -07:00
William Li
06f597b8e4 Fix wrong ListDefinition 2017-04-10 22:31:40 -07:00
William Li
1ccf02e226 Replace helpUsage text 2017-04-10 22:11:14 -07:00
William Li
a6d3012da1 Replace dotnet help parser with CliCommandLineParser
CliCommandLineParserVersion 138 cannot use help as command and --help as
opinion at the same timem, update to 142
2017-04-10 22:11:14 -07:00
William Li
cddffb08d2 Refactoring: Move UsageText to a separate file 2017-04-10 22:10:14 -07:00
Mike Lorbetske
fc77d7e152 Update templates & engine, rename --skip-restore to --no-restore 2017-04-10 20:00:17 -07:00
Eric Erhardt
ae78b87587 Update SDK to 2.0.0-alpha-20170410-1. 2017-04-10 14:24:52 -05:00
Eric Erhardt
99f9786ac7 Merge pull request #6270 from eerhardt/CacheRename
Rename `cache` to `store`.
2017-04-10 12:15:25 -05:00
Livar
67563a4f12 Merge pull request #6268 from livarcocc/remove_1_0_runtime
Removing the additional shared framework from the official stage2 build of the CLI
2017-04-08 12:30:41 -07:00
Livar
18126c4ea8 Merge branch 'master' into CacheRename 2017-04-08 09:36:15 -07:00
Livar
cc9271119e Merge pull request #6266 from wli3/fix-migrate-x
Fix migrate command's parse error
2017-04-08 09:34:52 -07:00
Livar Cunha
c8b042fd1b Fixing the build. 2017-04-08 00:31:27 -07:00
Livar Cunha
4c926ec9c5 Fixing the order in which we publish the stage2 with the legacy runtime. 2017-04-08 00:31:27 -07:00
Livar Cunha
772e838ff8 Removing the additional shared framework from the official stage2 build of the CLI. Instead, I also create a stage2 build with the legacy runtime so that we can continue to run tests tthat depend on it, but most importantly, we will be able to run backwards compatibility tests using it. 2017-04-08 00:31:27 -07:00
Eric Erhardt
07b25e268c Rename cache to store.
Rename `dotnet publish --filter` to `dotnet publish --target`.

Partial fixes for #6243, #6244
2017-04-07 14:21:16 -05:00
William Li
4f52ed37f7 Fix migrate command's parse error
argument. So, when it is trying to materialize MigrateCommand, the file
path does not match what it is expected(a bool).
2017-04-07 08:01:06 -07:00
Mike Lorbetske
379dd5c9e0 Update template engine & template versions 2017-04-05 13:50:12 -07:00
Eric Erhardt
b00384f497 Merge pull request #6234 from eerhardt/SelfContained
Add --self-contained to publish.
2017-04-04 12:03:09 -05:00
Livar
6c5d622b9e Merge pull request #6151 from smadala/rd-arg
Add results-directory switch to dotnet test
2017-04-04 08:31:58 -07:00
Satya Madala
bd10beafae update help message for test results directory 2017-04-04 12:40:18 +05:30
Livar
34f7df0763 Merge pull request #6209 from livarcocc/first_run_fallback_folder
First run fallback folder
2017-04-03 23:23:29 -07:00
Livar Cunha
af3d2a6c5c Fixing formatting issues pointed out during code review. 2017-04-03 22:18:05 -07:00
Livar Cunha
3d0089552c Fixing failures in tests when the user has a fallbackfolder setup on this machine already. These failures are again due to the fact that --packages are not populated when the packages are found in the fallback folder. 2017-04-03 22:15:40 -07:00
Eric Erhardt
ab15200500 Add --self-contained to publish.
This flows to the $(SelfContained) property added in https://github.com/dotnet/sdk/pull/1053
2017-04-03 18:17:08 -05:00
Livar Cunha
347bd4b1fe Fixing the location of the sentinel and placing it side by side with the fallback folder. 2017-03-30 14:14:36 -07:00
Livar Cunha
0c1af8a2fe Enabling E2E tests by setting HOME and USERPROFILE env variables. This will cause the NuGet.Config and fallback folder to be extract to the location in those variables during the tests. Also refactored all NuGet path calculators for the first run to a single place. 2017-03-30 11:28:01 -07:00
jonsequitur
7a90675be7 enforce repeating options to for multiple arguments 2017-03-30 07:43:04 -07:00
Livar Cunha
a46237784e Modified the build script to generate the lzma archive without the nupkgs. Modified the configurer to upsert NuGet.Config with the fallback folder info and to extract the fallback folder. Added unit tests for all this. Next step: update E2E tests. 2017-03-30 00:11:17 -07:00
Satya Madala
8bed1b3a23 Update help text 2017-03-30 12:13:14 +05:30
Petr Onderka
8eab3ad038 Fixed broken links 2017-03-28 15:50:05 +02:00
Chris Rummel
3928c2739c
Make folder case consistent.
This causes no build issues (because the .csproj uses the default wildcard include),
but prevents the repo from being pushed to VSO Git.
2017-03-27 15:23:14 -05:00
Chris Rummel
cd0fc7886c
Make folder case consistent.
This causes no build issues (because the .csproj uses the default wildcard include),
but prevents the repo from being pushed to VSO Git.
2017-03-27 14:59:40 -05:00
Livar
e09c33400c Merge pull request #6138 from livarcocc/tool_fallback_folder
Switched to using a FallbackPackagePathResolver to find the tool dll
2017-03-27 10:57:55 -07:00
Livar Cunha
b2116cd2e1 Addressing comments by adding a test covering the case where the tool assemblies are not found. 2017-03-26 21:52:27 -07:00
Satya Madala
12e59ebb6e Merge branch 'master' into rd-arg 2017-03-25 16:33:01 +05:30
Satya Madala
8a6913b2fe Add results directory arg to dotnet test 2017-03-25 15:18:14 +05:30
Nick Guerrera
fcd3c149f8 Merge pull request #6136 from nguerrera/vs-version-props
Package bundled version props in to a VS insertion nupkg
2017-03-24 15:56:04 -07:00
Livar
9f186882b3 Merge pull request #6120 from dasMulli/bugfix/run-directory-arg
Allow directories as project arguments to run command.
2017-03-24 14:14:50 -07:00
Livar Cunha
10e743e8e5 Switched to using a FallbackPackagePathResolver to find the tool dll, because now with Fallback folders, we can have the tool dll in the fallback folder but its assets file in the user nuget cache. This happens because Nuget never writes to the fallback folder, including the tool's assets file that it generates during restore. 2017-03-24 12:17:27 -07:00
Livar
b2ac1cf8df Merge pull request #6134 from jonsequitur/stop-splitting-tokens-when-option-is-not-valid
update CommandLineParser version for more selective option splitting
2017-03-24 12:14:47 -07:00
Nick Guerrera
5e26d0f160 Package bundled version props in to a VS insertion nupkg 2017-03-24 11:11:31 -07:00
dasMulli
a4cb3fdf81
Allow directories as project arguments to run command. 2017-03-24 06:44:53 +01:00
jonsequitur
abfb877c5d update Microsoft.DotNet.Cli.CommandLineParser version for more selective option splitting 2017-03-23 17:12:35 -07:00
Nick Guerrera
e644058c0e Merge branch 'master' into version-props 2017-03-23 13:59:47 -07:00
Livar
960b3808ee Merge pull request #6115 from jonsequitur/adaptive-help-spacing
Adaptive help spacing
2017-03-23 13:13:49 -07:00
jonsequitur
149f292b6a check for help in DotNetTopLevelCommandBase 2017-03-23 08:15:41 -07:00
jonsequitur
857df6a384 remove unused variable 2017-03-22 15:47:54 -07:00
Nick Guerrera
a5051a0aff Generate bundled version props 2017-03-22 15:28:39 -07:00
jonsequitur
94bc781df7 remove debug file output 2017-03-22 13:51:45 -07:00
jonsequitur
c58b0b70a6 add null propagation 2017-03-22 13:51:32 -07:00
jonsequitur
055523770a update CliCommandLineParser version 2017-03-22 13:51:09 -07:00
jonsequitur
53f9b4f427 fix spelling error 2017-03-22 13:04:58 -07:00
Livar
485237a8a0 Merge pull request #6097 from ellismg/fix-6096
Don't write `\b` when output is redirected
2017-03-21 21:54:08 -07:00
Matt Ellis
bdfc759350 Don't write \b when output is redirected
Fixes #6096
2017-03-21 18:03:43 -07:00
jonsequitur
0eca6cb9cd remove unused forwarded argument 2017-03-21 14:55:33 -07:00
jonsequitur
66980de543 merge 2017-03-21 14:19:56 -07:00
Livar
09f07e8b04 Merge pull request #6090 from eerhardt/Run
Port #4403 back into the main source code.
2017-03-21 13:11:02 -07:00
jonsequitur
4effd9354c merge 2017-03-21 11:57:08 -07:00
Eric Erhardt
55eb812664 Port #4403 back into the main source code.
This change was lost when we converted the MSBuild "run3" verb to just "run".

Fix #6076
2017-03-21 13:46:08 -05:00
jonsequitur
4425398fc8 set loc strings for parser-formatted help 2017-03-21 11:41:09 -07:00
Livar
a70f2a7af8 Merge pull request #6054 from eerhardt/EnableLinuxTests
Enable tests on linux portable build.
2017-03-20 20:59:44 -07:00
Rama Krishnan Raghupathy
a48f3a6bbf Using Apphost.exe for standalone apps 2017-03-20 18:06:48 -07:00
Eric Erhardt
8e239a4825 Clean up dead code
These are old usages of GetRuntimeIdentifier() that are no longer needed.
2017-03-20 12:23:23 -05:00
jonsequitur
3e265a98b8 fix merge issues 2017-03-19 18:48:16 -07:00
Jon Sequeira
6cfec479cb Merge branch 'master' into tab-completion 2017-03-19 18:20:29 -07:00
jonsequitur
c85492bd48 merge master 2017-03-19 17:09:05 -07:00
jonsequitur
daac945742 restore loc strings, subcommand parsers into separate files 2017-03-19 16:38:08 -07:00
Jon Sequeira
43c13f2f53 move parse result validation to CommandBase to allow custom messages 2017-03-19 14:30:43 -07:00
jonsequitur
f8e051895e re-enable colon and equals signs as argument delimiters 2017-03-17 13:28:21 -07:00
jonsequitur
0d04b51c93 get the full path for dotnet cache output 2017-03-17 11:06:58 -07:00
Livar
1574349a59 Merge pull request #5875 from dotnet/mairaw-patch-1
Fix misleading string for dotnet add package
2017-03-16 19:55:33 -07:00
Maira Wenzel
1ee9529203 reverted SpecifyExactlyOnePackageReference string 2017-03-16 16:10:48 -07:00
Jon Sequeira
4d8bab8389 remove extra diagnostic output from ForwardApp 2017-03-16 15:46:27 -07:00
Livar
5476ad9cf8 Merge pull request #6053 from smadala/tp-redist-02
Netcoreapp2.0 targetted TestPlatform
2017-03-16 14:56:23 -07:00
jonsequitur
973021b214 publish, cache, text fixes; rename ForwardAs and introduce ForwardAsMany 2017-03-16 13:22:08 -07:00
Satya Madala
1f886632f2 remove NetCore10Assemblies renaming back 2017-03-17 00:20:40 +05:30
Maira Wenzel
9b06921b75 addressed feedback 2017-03-16 10:59:33 -07:00
jonsequitur
8aa702dc97 text fixes for dotnet remove 2017-03-16 10:46:08 -07:00
jonsequitur
9c2e8f0037 text fixes, remove file existence validations from parse 2017-03-16 09:49:07 -07:00