Commit graph

735 commits

Author SHA1 Message Date
Justin Goshi
89f0b05958 Improve sln migration tests (#5066)
* WIP Improve sln migration tests

* Simple migration test

* Improve the test

* WIP update test assets

* Update test

* Test a bug fix

* Add another migrate sln test

* Fix FilePath related tests

* Finish the migrate sln tests

* Fix tests

* Fix another path issue
2016-12-20 13:04:01 -10:00
jonsequitur
620e573f95 make migration backup folder a sibling of the project root 2016-12-20 14:35:52 -08:00
Ankit Mishra
abd496a6f1 Adding base add package sub command 2016-12-20 14:24:10 -08:00
Abhitej Anoop John Bandi
0aa5d6256e Updating the template to point to the rc packages of MSTest. 2016-12-20 20:11:41 +05:30
Zlatko Knezevic
b467d66182 Remove argument separator from commands (#5080)
* Remove argument separator from commands

Currently, the argument separator (`--`) is only supported on
`dotnet run`. This PR removes it from other commands to make the help and
usage of these command clearer.

* Adding dotnet run message test

* Responding to PR feedback
2016-12-19 22:11:39 -08:00
Alex Barney
9b4cb6a072 Add Runtime Identifier option to dotnet-restore
* Add an option to specify an RID when restoring
* This brings the option from the publish and build command to the restore command
2016-12-18 22:50:42 -06:00
Livar Cunha
44147f0efa Updating xlf files to reflect the modification of the test help message, of the dotnet help update and the additions of CommandLine, Migration, Sln.Internal, msbuild command and Cli.Utils. 2016-12-17 10:55:12 -08:00
Piotr Puszkiewicz
2b983f916f dotnet-msbuild loc 2016-12-16 22:45:47 -08:00
Zlatko Knezevic
3073e9bd2c Responding to PR feedback 2016-12-16 19:14:30 -08:00
Zlatko Knezevic
0da755f405 Responding to PR feedback 2016-12-16 19:14:30 -08:00
Zlatko Knezevic
7294260e09 More text cleanup 2016-12-16 19:14:30 -08:00
Zlatko Knezevic
4e554f9741 Resetting dotnet run to original state 2016-12-16 19:14:30 -08:00
Zlatko Knezevic
b7f3e39413 Finishing touches on help messages
Making finishing touches on all the CLI commands' help messages. Also
adding dotnet clean to the help output list.

Fixes #5048,#5017
2016-12-16 19:14:29 -08:00
Livar
9c3141b63f Merge pull request #5057 from dotnet/dev/jgoshi/removeProj
Implement dotnet remove project
2016-12-16 18:56:28 -08:00
Zlatko Knezevic
7dadb95d3c Fixing dotnet test help text (#5032)
Renaming --test-case-filter to just --filter to make it easier to use.
Placing more examples and more clarity for the --filter command.

Fixes #5021
2016-12-16 18:50:19 -08:00
Livar
f1c16e59d6 Merge pull request #5043 from livarcocc/d_for_diagnostics
Changing the host verbosity flag to -d|--diagnostics
2016-12-16 16:05:02 -08:00
Justin Goshi
45264edcd7 Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj 2016-12-16 14:53:33 -08:00
Nick Guerrera
d54ee6ff82 Update xlf with new/removed/modified strings 2016-12-16 13:32:48 -08:00
Justin Goshi
917154fd5d Address PR comments 2016-12-16 13:27:41 -08:00
Nick Guerrera
ef08c401ef Merge pull request #5051 from v-zbsail/localization
LOC CHECKIN | cli | HB 20161216
2016-12-16 13:24:56 -08:00
Livar Cunha
9fd4903bf3 Addressing code review comments and adding a test for dotnet --help. 2016-12-16 12:58:34 -08:00
Livar Cunha
5558e5f728 Changing the host verbosity flag to -d|--diagnostics from -v|--verbosity so that it is not confused with the verbs verbosity flag. 2016-12-16 12:58:34 -08:00
Justin Goshi
ae1e183e41 Complete the refactor and test improvements 2016-12-16 10:23:26 -08:00
Justin Goshi
82f5278d8a Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj 2016-12-16 08:44:38 -08:00
Justin Goshi
806d5a2589 Implement dotnet list projects (#5027)
* Implement dotnet list projects

* Address PR comments

* Fix build breaks
2016-12-16 06:41:47 -10:00
Justin Goshi
023a899db0 WIP Refactor and improve tests 2016-12-16 01:04:09 -08:00
Zbyněk Sailer
8dcfd37755 LOC CHECKIN | cli | HB 20161216 2016-12-16 09:46:50 +01:00
Justin Goshi
20f2242947 Adding dotnet remove project tests 2016-12-15 15:48:04 -08:00
Justin Goshi
07ddddfa88 Implement dotnet remove proj 2016-12-15 13:40:46 -08:00
Justin Goshi
441277ccfa Implement dotnet add project (#5022)
* Implement dotnet add project

* Addressed PR comments
2016-12-14 13:53:11 -10:00
Livar
e5955e8802 Merge pull request #5015 from dotnet/shanselman-patch-3
Removing duplicate space in "The Current OutputType is" usage
2016-12-14 09:12:12 -08:00
Justin Goshi
76722fd403 Improve the help text (#5002)
* WIP Improve help text

* Improve help text

* Address PR comments

* Address PR comments

* Address PR comments
2016-12-13 14:31:35 -10:00
Scott Hanselman
c50aeb318e Removing duplicate space in "The Current OutputType is" usage
Removing duplicate space in "The Current OutputType is" usage

The LocalizableStrings.RunCommandExceptionUnableToRun3 always has as trailing space. Every instances does. Here we are adding a SECOND space so the result is:

The current OutputType is  'Library'.
2016-12-13 14:52:03 -08:00
Justin Goshi
2b7e9b6524 Clean up sln reader/writer (#5005) 2016-12-13 06:45:00 -10:00
Zlatko Knezevic
d335b5de40 Changing dotnet-test options (#4987)
In Preview 3, the `dotnet test` options were not aligned with the CLI's
adopted format. This PR changes the options to be aligned. Where
possible/applicable, I have shortened the long options to a meaningful
mnemonic short version.

Fixes #4960
2016-12-12 23:29:29 -08:00
Krzysztof Wicher
8eaec8715b Merge pull request #4972 from krwq/p2p-compat-check
add compat checks to dotnet add
2016-12-09 15:32:15 -08:00
Krzysztof Wicher
524fe3cb6b apply review feedback 2016-12-09 12:11:11 -08:00
Livar
1fd99f1588 Merge rel/1.0.0-preview4 back into rel/1.0.0 (#4974)
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of https://github.com/NuGet/Home/issues/4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (#4948)

* Update WebSDK version

* Update web template to get rid of globs

https://github.com/aspnet/Templates/pull/735

* MSBuild to 15.1.458 (#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
2016-12-09 00:30:02 -08:00
Krzysztof Wicher
2d38aaa6e1 fix dotnet-add-p2p tests 2016-12-08 14:56:31 -08:00
Krzysztof Wicher
84e4da57cc add compat checks to dotnet add 2016-12-08 13:06:12 -08:00
Livar
355b6233cb Merge pull request #4944 from vsccarl/restoreLoc
Fixed a missing interpolation operator
2016-12-07 14:42:47 -08:00
Justin Goshi
0831316321 Allow migration of sln files (#4949)
* WIP Migrate sln files

* WIP add reference to redist

* Adding tests and fixing a few bugs

* Fix some tests

* Remove use of DeepClone

* Fix test build errors

* Fix more tests
2016-12-07 11:49:15 -10:00
Krzysztof Wicher
79e6126b2a add dotnet list p2ps (#4929)
* add stub for dotnet list p2ps

* apply review feedback

* PR feedback: consistent method modifiers

* apply missed review feedback

* add test coverage and do not treat no p2ps as error

* move private methods to the bottom, rename weird res name
2016-12-07 12:56:27 -08:00
Piotr Puszkiewicz
15e86d8c58 Merge branch 'rel/1.0.0' into restoreLoc 2016-12-07 00:51:53 -08:00
Scott Carlton
d29925a689 Fixed spacing for some strings (#4943)
Some strings lost a space before .NET for some reason. Fixed now.
2016-12-07 00:46:40 -08:00
Scott Carlton
3890acd8da Fixed a missing interpolation operator 2016-12-06 10:04:11 -08:00
Nick Guerrera
a41b3d936b Add more xlf files for new strings 2016-12-05 13:12:48 -08:00
Livar
2e6cc71286 Merge pull request #4903 from vsccarl/LocAddCommand
Localization changes for dotnet-add and dotnet-add-p2p
2016-12-05 13:09:19 -08:00
Livar
7ee59f8b4d Merge pull request #4902 from vsccarl/LocNew
Localization for dotnet-new command
2016-12-05 12:38:01 -08:00
Scott Carlton
0804055422 Added back SpecifyAtLeastOneReferenceToAdd 2016-12-05 12:00:12 -08:00
Scott Carlton
e5954ca4f0 More string.Format fixes 2016-12-05 11:09:05 -08:00
Scott Carlton
11ea49dc7c added a string.Format 2016-12-05 11:04:19 -08:00
Scott Carlton
464f2d9a6c Updated wrong localizableStrings reference 2016-12-05 10:58:47 -08:00
Piotr Puszkiewicz
337becdefd Merge branch 'rel/1.0.0' into LocAddCommand 2016-12-05 10:53:52 -08:00
Scott Carlton
65a3d0e500 More string changes. 2016-12-05 10:47:10 -08:00
Scott Carlton
5935b9bea7 More string changes 2016-12-05 10:47:05 -08:00
Scott Carlton
2554aeda89 Fixed strings 2016-12-05 10:24:11 -08:00
Scott Carlton
c5955743d8 Fixed broken up strings 2016-12-05 10:23:34 -08:00
Piotr Puszkiewicz
ca8904ec3a Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-05 02:58:41 -08:00
Scott Carlton
6a38780f4e Localize dotnet-remove-p2p (#4901)
* Rename centralized LocalizableStrings file

* Merge

* Small fixes
2016-12-05 02:57:30 -08:00
Piotr Puszkiewicz
3566b9309d PR feedback 2016-12-05 01:07:15 -08:00
Piotr Puszkiewicz
e249d4a0bc Squash 2016-12-05 01:07:15 -08:00
Piotr Puszkiewicz
c4d5432e1a Merged branch rel/1.0.0 into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 23:38:09 -08:00
Piotr Puszkiewicz
82ec742d37 Squash 2016-12-04 23:36:02 -08:00
Scott Carlton
29b824a6ff Fix formatting of string litteral, squash. (#4899) 2016-12-04 22:54:42 -08:00
Piotr Puszkiewicz
0e55a41f69 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 22:32:38 -08:00
Piotr Puszkiewicz
d6cab4af58 use Sdks attribute in dotnet new templates (#4916)
* Move dotnet-new templates to Sdk attribute

* Update to MSBuild 15.1.0-preview-000454-01

To pick up a fix for Microsoft/msbuild#1431.

* Fix template newlines

* Fix casing on Microsoft.Net.Sdk

* Move migration test csproj's to Sdk attribute

* Disable parallel sdk restore

Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.

* Make casing of SDK 'NET' and not 'Net'

* Remove redundatn imports

* Fix test string

* Additional race

* Replacing the SDK with the Web.Sdk when it is a Web project.

* Fixing the test by writting the csproj before running the migration rule.
2016-12-04 22:31:58 -08:00
Scott Carlton
dc3d88c587 Localize changes for dotnet-remove (#4900)
* Rename centralized LocalizableStrings file

* Added RemoveDefinition

* Rebase

* rebase, remove localizablestrings for help

* loc for help command

* remove localizablestrings

* Localization changes for dotnet-remove

* Slight refactoring
2016-12-04 21:33:43 -08:00
Scott Carlton
e3cfe1d13d Localization for the Help Command (#4891)
* Localization for the Help Command

* Updated ProjModificationCommands

* Added RemoveDefinition

* Make UsageText `static readonly`
2016-12-04 20:24:02 -08:00
Piotr Puszkiewicz
53ba8070e4 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateCSharpWebTemplatesForSdkAttribute 2016-12-04 15:17:33 -08:00
Nick Guerrera
5195aad7d1 Initial commit of xlf files for localization (#4898)
* Initial commit of xlf files for localization

* Update xlf with converter tool bug fix
2016-12-04 12:16:08 -08:00
Mike Lorbetske
b2932f5511 Adjust the C# web template for the SDK attribute
Use the attribute
Remove the initial and final imports
Extend GlobalExclude
Update the include patterns
Remove the PackageReference for the SDK
2016-12-03 22:57:33 -08:00
Piotr Puszkiewicz
da82bdb05d Centralize Microsoft.Net.SDK Version (#4890)
* Centralize Microsoft.Net.Sdk package version

Note: Templates were omitted as their version needs to be static.

* Unifying additional missmatched versions

* prefercliruntime

whitespace threw off ReplaceAll

* Additional missed globs

* Revert SDK version for performance tests

* PR Feedback

* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
2016-12-02 09:34:03 -08:00
Scott Carlton
0622068cc9 Localization for the Test command (#4886) 2016-12-01 17:15:25 -08:00
Piotr Puszkiewicz
e82ed6799d Enable overriding MSBuildSDKsPath with env var (#4885) 2016-12-01 14:45:55 -08:00
Scott Carlton
8083a68944 Localized strings for the dotnet-pack command. (#4879)
* Localized strings for the dotnet-pack command.

* Moved parameters of options to a new line

* Moved the other option parameters
2016-12-01 13:19:34 -08:00
Scott Carlton
1aa562d97f Localization for dotnet-clean command. (#4878)
* Localization for dotnet-clean command.

* Modified spacing to keep under the 120 char limit

Moved the parameters of each option to a new line.

* Moved projectArgument parameter to a new line
2016-12-01 11:20:44 -08:00
Livar
15d278a07f Merge pull request #4877 from vsccarl/InterpolationFix
Interpolation fix for run, restore, and build commands
2016-11-30 21:44:44 -08:00
Krzysztof Wicher
7312e1cb3a Merge pull request #4868 from krwq/i4746-dotnet-remove
Add dotnet-remove-p2p
2016-11-30 16:14:47 -08:00
Krzysztof Wicher
1f56e84b7e Remove P2PHelpers and simplify constructors in MsbuildProject 2016-11-30 13:43:43 -08:00
vsccarl
93d5dca470 Added interpolation operator for strings in run command 2016-11-30 13:06:21 -08:00
vsccarl
f93a5d3d83 Fixed Interpolation for restore and run commands 2016-11-30 13:03:24 -08:00
Scott Carlton
879ae39f35 Extract localizable strings from dotnet-publish (#4801)
* Extract localizable strings from dotnet-publish

* Added $ to interpolated strings

* Update Program.cs
2016-11-30 09:04:04 -08:00
Krzysztof Wicher
78d95b423e dotnet-remove-p2p implementation complete - no tests 2016-11-29 14:00:44 -08:00
Krzysztof Wicher
6a703ffa73 normalize slashes and casing when comparing includes 2016-11-29 12:49:38 -08:00
Krzysztof Wicher
4e3c73e778 extract logic for opening project and preserving directory and path to separate class 2016-11-29 10:23:04 -08:00
Krzysztof Wicher
1edda43dd1 reorg of code so that sharing is easier + stub for dotnet-remove-p2p 2016-11-29 09:44:39 -08:00
Krzysztof Wicher
f49e29711f Merge pull request #4758 from krwq/i4521
Fix 4521: Add dotnet-add-p2p
2016-11-28 13:51:08 -08:00
Enrico Sada
7b0117ac85 Update fsharp templates for preview4 with latest msbuild style (#4836)
* update web template

* add test build of fsharp/web template

* align fsharp/xunittest template

* add test for all template projects

* align fsharp/console template to #4821

* align fsharp/lib template to #4821

* align fsharp/mstest template to #4821

* align fsharp/xunittest template to #4821

* fix shortened test directory path (was same for c# test)

* try fix ci failure
2016-11-28 00:45:38 -08:00
Faizan2304
eb8e0cfa40 Bug fixes (#4810)
* Bug fixes

* Nitpick

* -Fixed failed tests
-Added test to cover trx logger scenario.

* Fix for issue https://github.com/Microsoft/vstest/issues/241

* Fix for failed test. We have taken fix where dotnet test will return nonzero if test fails. In multi TFM scenario if test fails it termates the whole process as dotnet test is returning 1. As a fix of this we should continue if some test fails for next TFM

* Bump Microsoft.Testplatform.CLI and Microsoft.NET.Test.Sdk version
2016-11-24 00:48:54 -08:00
Piotr Puszkiewicz
3a3ab7e0b0 MSBuildSDKsPath (#4824)
* Tests in place

* Implementation
2016-11-23 23:54:44 -08:00
Enrico Sada
2cf0675270 add F# templates to dotnet new (#4789)
* add F# templates to `dotnet new`

* add dotnet new tests

* avoid conflict with cs test dir

* fix test
2016-11-23 22:57:54 -08:00
Krzysztof Wicher
8b565616a0 Strings->LocalizableStrings, Extensions->ProjectRootElementExtensions, fix long lines, remove empty line 2016-11-23 15:35:48 -08:00
Livar
e546af19a2 Merge pull request #4831 from phenning/updateWeb
Update Web Template from Template repo
2016-11-23 15:29:20 -08:00
Krzysztof Wicher
592af9dd61 Extract error messages to separate class 2016-11-23 10:41:30 -08:00
Phil Henning
14445b936e Remove Exclude from Compile/Embeddedresource 2016-11-23 10:16:44 -08:00
Phil Henning
45b817a953 Update Web Template from Template repo 2016-11-23 10:03:53 -08:00
Jeff Kluge
2205a8577c Move project.lock.json during migration
Closes #4753
2016-11-23 09:46:36 -08:00
Krzysztof Wicher
3fc0517cda update dotnet --help text 2016-11-22 14:48:40 -08:00
Krzysztof Wicher
b8b7d98256 last touches 2016-11-22 14:46:33 -08:00