Commit graph

1131 commits

Author SHA1 Message Date
Justin Goshi
5bbac55736 Migration: do not add a csproj to the solution if it already exists 2017-01-19 11:23:01 -08:00
Livar Cunha
cdf91f2f30 Fixing dotnet migrate global.json. This was failing because we were turning global.json into an empty string and trying to construct a directory for it. The fix was to detect this and transform it into a . directory. Migrate is already respecting the projects node in global.json. 2017-01-19 10:55:23 -08:00
Satya Madala
44b14f987e Add results directory arg to dotnet test 2017-01-19 11:27:37 +05:30
Krzysztof Wicher
1a20d7f82c Merge remote-tracking branch 'github/rel/1.0.0-rc3' into rel/1.0.0 2017-01-18 12:38:11 -08:00
Justin Goshi
a5fb786228 Ensure we don't downgrade VS version 2017-01-17 14:48:54 -08:00
Justin Goshi
2676682fec Migrate should change the visual studio version 2017-01-17 13:45:48 -08:00
Mike Lorbetske
03de88f24b Update dotnet new templates with beta5 xunit (#5339)
* Pull latest template engine version

* Bump xunit version and take corresponding template engine

* Rollback template engine version bump
2017-01-16 19:31:33 -08:00
Zbyněk Sailer
8dbab0f79a LOC CHECKIN | dotnet/cli | 20170116 2017-01-16 14:52:18 +01:00
Livar Cunha
8c2e7c9f01 Merge branch 'rel/1.0.0-rc3' into merge_rc3
* rel/1.0.0-rc3:
  Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
  Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
  Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
  Adding a few more packages that were not in the manifest and moving some tests around.
  Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
  Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
  Migration: do not inject built in compile includes that the SDK does
  Update msbuild to 15.1.0-preview-000522-02
  Migration: Do not add RIDs for Library projects (#5279)
  Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
  Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Justin Goshi
f972cf80a9 Treat /? the same as --help (#5285)
* Fixes issue 4539

* Support -?
2017-01-13 01:24:12 -08:00
Krzysztof Wicher
22e85c2f77 fix stack trace for unhandled exceptions in dotnet-migrate 2017-01-12 16:08:54 -08:00
Krzysztof Wicher
5fea7c3ae6 Remove try catches choking all exceptions (#5206)
* remove some try catches choking all exceptions

* rename ExceptionExtension to ReportAsWarning, show full stack instead of just message

* dotnet-migrate try catch clean-up

* fix migration test failures
2017-01-12 15:42:36 -08:00
Livar Cunha
deb50a3cc7 Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list. 2017-01-12 11:38:05 -08:00
Piotr Puszkiewicz
0f9888c11d Merge branch 'rel/1.0.0' into piotrpMSFT/merge/rc3toRTM 2017-01-11 17:15:44 -08:00
Krzysztof Wicher
c9b873caad make dotnet-build show build summary (#5277)
* make dotnet-build show build summary

* Fix race in some dotnet-migrate (sln) tests
2017-01-11 17:06:03 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
Mike Lorbetske
ad6fab0a15 Synchronize templates with new3, add global.json (#5244)
* Synchronize templates with new3, add global.json

* Add runtimeconfig.template.json for web

Removes global.json write during template creation

* Remove global.json check from the test

* making templates the same as new3 templates

* Fix broken PrivateAssets, content update

Sets OutputType as appropriate
Alphabetizes package references

* Rollback browserlink version to 1.0.0

* Downgrade 1.1.0 of browserlink to 1.0.0 as well

* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Eric Erhardt
465655c85a Revert "Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0"
This reverts commit 4e951a480b, reversing
changes made to 006fd49e5c.
2017-01-10 13:36:40 -06:00
seancpeters
4e951a480b Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0 2017-01-10 10:50:40 -08:00
Livar Cunha
3220b14248 Updating the branding of the CLI to 1.0.0-rc3 2017-01-09 13:59:03 -08:00
Nick Guerrera
ea2908504c Update xlf files 2017-01-09 08:58:13 -08:00
Livar
87e9815a25 Merge pull request #5234 from harshjain2/tpv2update
Updated version of Test Platform
2017-01-07 14:44:01 -08:00
Livar
f2f37729b8 Merge pull request #5235 from eerhardt/PopulateNuGetCache11
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Harsh Jain
d8a323f146 Removed output type as it is handled through Microsoft.NET.Test.Sdk 2017-01-07 20:51:36 +05:30
Harsh Jain
0222e8e850 merged to resolve conflicts 2017-01-07 20:40:50 +05:30
Krzysztof Wicher
7042e85292 dotnet list p2ps -> dotnet list reference 2017-01-06 14:58:38 -08:00
Krzysztof Wicher
528d37bda5 dotnet remove p2p -> dotnet remove reference 2017-01-06 14:58:38 -08:00
Krzysztof Wicher
3ad9b72664 dotnet add p2p -> dotnet add reference 2017-01-06 14:58:38 -08:00
Mike Lorbetske
decec5f8da First step to ingest template engine (#5065)
* First step to ingest template engine

Please do not merge yet
@piotrp @seancpeters @livarocc

* Localization

* Attempt to get a build going

Rename program.cs to New3Command.cs
Move TableFormatter into its own file
Consume template engine packages version 1.0.0-beta1-20161218-24
Temporarily add MyGet templating feed so that package restore will work

* Update ExtendedCommandParser

Make short form args prefer longer runs of characters in the source
parameter before falling back to p:shortname syntax
Change scoping for a few methods to get rid of inconsistent visiblity
errors

* Fix package installation wildcards

* Cleanup New3Command, fix review issue, bump version, sorting for template list

* Installation, loc fix, help formatting

* Use latest TemplateEngine packages

* New3 unit tests

* Fixed formatting on csproj files

* Add the build steps to add templates to the layout

* Change tests slightly to make comparisons easier

Also fixes the wrong flag getting passed to set language

* Fixes for 127, 128, 130, 131 - help display

* Sync to latest TemplateEngine version

Absorbs new search logic

* All tests passing

Cleaner New3Command
Support for project/item template contexts

* Try to make tests more durable

* Disable test parallelization for dotnet-new tests

* Update web SDK and template engine versions

* Remove AI package feed

* Simplify CLI interface to Template Engine

* Fix host identifier and update to latest packages

* Update template engine & Web SDK versions

* Fix template engine version

* Remove UsingTask and redeclaration of property
2017-01-06 14:48:27 -08:00
Livar
5e7b946ad7 Merge pull request #5231 from v-zbsail/localization
LOC CHECKIN | dotnet/cli | 20170106
2017-01-06 14:48:14 -08:00
Justin Goshi
e109a9be47 dotnet sln command (#5233)
* Add dotnet sln command

* Use new names for localizable strings

* Fix up the tests for the verb rename
2017-01-06 10:58:23 -10:00
Livar
f0d6b20dd7 Merge branch 'rel/1.0.0' into localization 2017-01-06 12:30:58 -08:00
Harsh Jain
effee47d38 Version update for test platform. 2017-01-07 01:04:00 +05:30
Eric Erhardt
dcbfa16380 Add SharedFx 1.1 templates for C# console and web. 2017-01-06 13:02:00 -06:00
Livar
dbdbde5bcc Merge pull request #5229 from livarcocc/another_xlf_update
Another update to the xlf files.
2017-01-06 10:20:08 -08:00
Zbyněk Sailer
bf7a0845b7 LOC CHECKIN | dotnet/cli | 20170106 2017-01-06 19:07:21 +01:00
Livar
b5991909fb Merge pull request #5227 from livarcocc/update_cli_no_implicit
Updating our projects and test assets to work with the latest SDK.
2017-01-05 23:04:17 -08:00
Livar Cunha
4bf55e3c38 Another update to the xlf files. 2017-01-05 23:01:58 -08:00
Livar
7bcffe9e82 Merge pull request #5222 from blackdwarf/slnlocstrings
Adding strings for dotnet-sln command for LOC
2017-01-05 22:07:48 -08:00
Livar Cunha
b41eb43883 Updating our projects and test assets to work with the latest SDK. 2017-01-05 19:44:52 -08:00
Zlatko Knezevic
ad3ee1dbb9 Fixing an errant semicolon 2017-01-05 17:25:46 -08:00
Zlatko Knezevic
af56e969f9 Responding to PR feedback 2017-01-05 16:58:12 -08:00
Zlatko Knezevic
1a35ffdb10 Responding to PR feedback 2017-01-05 16:44:43 -08:00
Livar
61dbfbf228 Merge pull request #5220 from mishra14/dev-anmishr-dotnetremovepackage
Adding dotnet remove package sub command
2017-01-05 16:33:34 -08:00
Livar
80f2ef6533 Merge pull request #5181 from harshjain2/clirunsettings
Added ability to pass runsettings as commandline parameters after --
2017-01-05 16:22:08 -08:00
Piotr Puszkiewicz
d14698f1f6 Bump MSBuild Version to 15.1.0-preview-000503-01 (#5199)
* Bump MSBuild Version to 15.1.0-preview-000503-01

* tool_csc->tool_roslyn

* pull some properties up to dir.props

* Move Roslyn to "Roslyn" subdirectory

* Fix relative paths in RunCsc.*

* Add removal of csc & vbc from deps.json

* Revert roslyn to 2.0.0-rc3-61212-03

* netcoreapp -> 1.0.3
2017-01-05 14:56:11 -08:00
Zlatko Knezevic
ab41acd8f5 Adding strings for dotnet-sln command for LOC
Adding strings both in the command folder as well as in the Help command.
2017-01-05 14:44:53 -08:00
Ankit Mishra
8334bb643d Fixing strings based on PR comments 2017-01-05 14:38:13 -08:00
Justin Goshi
f8de8d5a80 dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid (#5218)
* dotnet add uses ProjectTypeGuid or DefaultProjectTypeGuid

* Create ProjectInstanceExtensions per PR comments
2017-01-05 12:04:57 -10:00
Ankit Mishra
c331dc3b97 Preparing for dotnet remove PR 2017-01-05 13:05:36 -08:00
Livar Cunha
3a4e23e373 Updating the SDK to an SDK that includes globing for source and resources implicitly. 2017-01-05 12:31:48 -08:00
Krzysztof Wicher
dfb0a28224 Merge pull request #5180 from krwq/5070b
Remove some cross project compile includes on cs files
2017-01-05 12:13:54 -08:00
Harsh Jain
f04930658d Merge branch 'rel/1.0.0' into clirunsettings 2017-01-06 01:15:49 +05:30
Harsh Jain
a4dbe61fe6 Addressed PR feedback. 2017-01-06 01:12:26 +05:30
Eric Erhardt
639d467c14 Merge pull request #5210 from eerhardt/UpdateSharedFx103
Update Microsoft.NETCore.App to 1.0.3.
2017-01-05 12:06:57 -06:00
Eric Erhardt
a80e8fa636 Update Microsoft.NETCore.App to 1.0.3. 2017-01-05 08:57:53 -06:00
Harsh Jain
6e9e5baa83 Merge branch 'rel/1.0.0' into clirunsettings 2017-01-05 10:25:53 +05:30
Justin Goshi
d0151a6111 Add/remove solution items based on directory structure (#5197)
* WIP support solution folders for dotnet add and remove

* Add/remove solution folders based on directory hierarchy

* Fix tests

* Disable the solution building tests

* Address PR comments

* Fix a build break due to a new tool version used in the build

* Create SlnProjectExtensions and SlnProjectCollectionExtensions per PR comments
2017-01-04 18:32:09 -10:00
Ankit Mishra
a461cfbb2b Adding dotnet remove package sub command 2017-01-04 18:48:14 -08:00
Harsh Jain
71027cda33 Merge branch 'rel/1.0.0' into clirunsettings 2017-01-05 00:53:41 +05:30
Harsh Jain
d31d5d2f2d Updated doc for -- 2017-01-05 00:46:48 +05:30
Justin Goshi
19b4bad315 Add/remove projects also updates build configurations (#5134)
* Add/remove projects also updates build configurations

* Fix the algorithm for adding/removing build configurations

* Address PR comments
2017-01-03 07:18:45 -10:00
Harsh Jain
d28721483a updated logic to consider everything after -- as runsettings. 2017-01-03 19:36:28 +05:30
Harsh Jain
19d919a640 Added method GetSemiColonEscapedArgs 2016-12-30 15:47:15 +05:30
Harsh Jain
245727183c Handling both mstest args and runsettings options after -- 2016-12-30 15:34:00 +05:30
Harsh Jain
8d86e14d44 Added support for passing runsettings options through command line after -- 2016-12-30 11:27:37 +05:30
Krzysztof Wicher
941575d188 Remove cross project compile include on DotnetFiles.cs 2016-12-29 14:34:24 -08:00
Justin Goshi
10f52d9a15 Improve error messages for why a solution failed to load (#5176)
* WIP Improve sln reader/writer error messages

* Added more tests

* Fix a few tests
2016-12-29 09:21:55 -10:00
Livar
a2d752fd2c Merge pull request #5164 from livarcocc/update_xlf_once_again
Updating xlf files once again
2016-12-28 13:46:56 -08:00
Satya Madala
05df71825d Testplatform release 15.0.0-preview-20161227-02 (#5055)
* Update testplatform packages version

* Refer TestPlatform version from DependencyVersions.props

* Updating the packages with respect to Testplatform release 15.0.0-preview-20161227-02

* Add dit.props to test assets projects
2016-12-28 10:17:33 -08:00
Livar Cunha
a37befab2f Updating xlf files to incorporate the runtime option in restore and localization for dotnet add package 2016-12-28 02:53:54 -08:00
Livar
4d45444266 Merge pull request #5142 from v-mdriml/localization
Loc HB XLF files 2016-12-23
2016-12-27 14:07:02 -08:00
Livar
47fb245258 Merge pull request #5122 from mishra14/dev-anmishr-dotnetaddpackage
Adding dotnet add package sub command
2016-12-27 11:26:04 -08:00
Livar
3a90af1546 Merge pull request #5079 from Thealexbarney/restore-rid
Add Runtime Identifier option to dotnet-restore
2016-12-27 09:27:36 -08:00
v-mdriml
5580b40181 Loc HB XLF files 2016-12-23 17:16:52 +01:00
Ankit Mishra
ac988a4ac9 Fixing on PR comments 2016-12-22 15:29:29 -08:00
Ankit Mishra
2738ea8a5a Merge branch 'rel/1.0.0' into dev-anmishr-dotnetaddpackage 2016-12-21 18:08:21 -08:00
Livar
b4ef34bc38 Merge pull request #5104 from livarcocc/update_sdks
Updating the projects files in the repo to use the SDK attribute.
2016-12-21 15:34:33 -08:00
Ankit Mishra
303a267a01 Clean up before PR 2016-12-21 11:44:45 -08:00
Ankit Mishra
0f6e4e3f10 FIxing argument adding 2016-12-20 19:48:52 -08:00
Ankit Mishra
3a5b89c242 Add package sub command 2016-12-20 18:52:33 -08:00
jonsequitur
9b28fbecd6 R: rename EnsureDirectory to EnsureDirectoryExists and similar 2016-12-20 16:03:00 -08:00
Livar Cunha
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -08:00
Jon Sequeira
35e3625d4b Merge branch 'rel/1.0.0' into make-migration-backup-folder-peer-of-project 2016-12-20 15:24:33 -08:00
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
Piotr Puszkiewicz
7c6dd4977b Fix build 2016-12-16 22:45:47 -08:00
PiotrP
1b8daa6ba3 Loc WiP 2016-12-16 22:45:46 -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
seancpeters
b40fd2f290 Merge branch 'IngestTemplateEngine' of https://github.com/mlorbetske/cli into rel/1.0.0 2016-12-16 17:27:20 -08:00
Mike Lorbetske
ecfc0e10ba Localization 2016-12-16 16:26:22 -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
Mike Lorbetske
cfa0e5cbd4 First step to ingest template engine
Please do not merge yet
@piotrp @seancpeters @livarocc
2016-12-16 15:15:48 -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
9a8d158e09 add test coverage 2016-12-08 16:23:21 -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
Livar
23fb676f2a Merge pull request #4931 from livarcocc/change_to_preview5
Updating the branding of rel/1.0.0 to preview5.
2016-12-05 15:47:08 -08:00
Livar Cunha
de9ae38375 Updating the branding of rel/1.0.0 to preview5. 2016-12-05 14:47:16 -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
Piotr Puszkiewicz
f18967e39a Update CLI's MSBuild Version to 15.1.0-preview-000451-02 (#4889)
* Centralize definition of MSBuild Version in CLI

* MSBuild --> 15.1.0-preview-000451-02
2016-12-01 20:10:42 -08:00
Scott Carlton
0622068cc9 Localization for the Test command (#4886) 2016-12-01 17:15:25 -08:00
Piotr Puszkiewicz
ecfd970045 Extra strings for localization (#4880)
* Update strings for localization

* re-align strings
2016-12-01 16:01:29 -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
Krzysztof Wicher
26442c8769 revert line endings in dotnet.csproj 2016-11-30 12:11:12 -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
65f699f1cc Prepare test project for dotnet-remove-p2p 2016-11-29 15:47:30 -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
Piotr Puszkiewicz
b47d728516 Hide restore output of first-run experience (#4740)
* Fix 4066

* Merge Conflict

* Move fix to the DotNetCommandFactory

* More normalization

The `\r\n` issue is oddly non-deterministic. This change did not affect the message endings and yet CI started failing. Normalizing both string should have the desired result...
2016-11-28 00:46:26 -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
Krzysztof Wicher
58fe57e315 Lock on spec - all tests passing on Windows 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
19dde128ba detect non-existing references and tiny refactor of tests 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
8e5ffaf176 fix some of the stuff in the feedback 2016-11-22 14:46:32 -08:00