mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5111 commits 41 branches 190 tags 95 MiB
Commit graph

2401 commits

Author SHA1 Message Date
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
Livar
fa52ea9d18 Merge pull request #5200 from livarcocc/remove_condition_tfm_for_single_tfm 
Remove condition tfm for single tfm
 2017-01-04 22:19:19 -08: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
Livar Cunha
a4dcff9ea8 Addressing code review comments. 2017-01-04 12:25:48 -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
Livar Cunha
47eafb9ef4 Removing the PackageTargetFallback condition on TFM when there is only a single TFM 2017-01-03 20:36:51 -08:00
Livar Cunha
e9561b3679 Removing the IsCrossTargetBuild from migrated scripts when there is only a single TFM 2017-01-03 17:15:39 -08:00
Krzysztof Wicher
6973d15d4a change visibility to internal 2017-01-03 16:51:15 -08:00
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
473d3cca37 Merge branch 'rel/1.0.0' into clirunsettings 2017-01-02 19:54:31 +05:30
Livar
06d33f01ce Merge pull request #5178 from livarcocc/update_tools_msbuild3 
Updating the migrated tools version to 1.0.0-msbuild3-final.
 2016-12-30 13:16:29 -08:00
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
Krzysztof Wicher
961905a301 Merge pull request #5158 from krwq/i5070 
Fix #5071: Eliminate some cross project dependencies in tests and fix local builds on windows
 2016-12-28 23:26:51 -08:00
Livar Cunha
fa675cb5e5 Updating the migrated tools version to 1.0.0-msbuild3-final. 2016-12-28 21:26:31 -08:00
Livar
a1a30e35a1 Merge pull request #5174 from livarcocc/no_transitive_dependency_migration 
Stopped doing hoisting of transitive project dependencies and references
 2016-12-28 20:24:12 -08:00
Livar Cunha
ad88058266 Stopped doing hoisting of transitive project dependencies and references. We also don't validate if a dependency exist, since migration strictly speaking does not need it. We move the project.json and the csproj will fail to build just like the project.json would. 2016-12-28 14:48:38 -08: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
Justin Goshi
35f2192f3b Improve Sln reader/writer tests (#5157) 
* WIP improve sln reader/writer tests

* Complete the tests
 2016-12-28 09:40:49 -10: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
Krzysztof Wicher
e9dc08eafa make localizablestrings internal again 2016-12-27 14:53:45 -08:00
Krzysztof Wicher
35bc8e1cc1 remove cross project reference from dotnet-add-p2p tests 2016-12-27 14:53:44 -08:00
Krzysztof Wicher
5095981ec3 fix line endings related errors in dotnet-add-p2p tests 2016-12-27 14:53:44 -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
Justin Goshi
b72d625168 Include ASP packages in offline cache (#5124) 
* Archive asp.net package references

* Archive asp.net package references

* Change the hash input so it's the same on all platforms

* Address PR comments
 2016-12-27 11:28:24 -10: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
Jon Sequeira
3b0a2f5d20 Merge pull request #5106 from jonsequitur/make-migration-backup-folder-peer-of-project 
make migration backup folder a sibling of the project root
 2016-12-21 12:12:11 -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
Krzysztof Wicher
a65d857f73 Merge pull request #5102 from krwq/i1494tools 
fix tools when restoring with --packages
 2016-12-20 18:20:25 -08:00
jonsequitur
05daa15ea1 backup folder cleanup to make tests using TestAssets rerunnable 2016-12-20 18:17:19 -08:00
Livar
10a1695d6c Merge pull request #5090 from livarcocc/migrate_app_config 
Emitting a None item for App.config if one exists side-by-side to the project.json
 2016-12-20 16:43:24 -08:00
Livar Cunha
3b081316ad Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones. 2016-12-20 16:38:04 -08:00
jonsequitur
9b28fbecd6 R: rename EnsureDirectory to EnsureDirectoryExists and similar 2016-12-20 16:03:00 -08:00
Krzysztof Wicher
4b00570f68 replace yield returns with linq query 2016-12-20 15:53:38 -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
Krzysztof Wicher
aa7fb60d73 remove redundant packagesRoot path check and reorder methods 2016-12-20 14:56:21 -08:00
Livar Cunha
4bda166b2f Emitting a None item for App.config if one exists side-by-side to the project.json. 2016-12-20 14:42:31 -08: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
Krzysztof Wicher
59ae0e2d3d fix tools when restoring with --packages 2016-12-20 12:18:55 -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
Krzysztof Wicher
2d5e40f3ba Merge pull request #5085 from krwq/i5019 
Add error message when tool is ivoked but not restored
 2016-12-19 16:51:14 -08:00
Livar
134e9af798 Merge pull request #5078 from livarcocc/preserve_rids_from_pj 
Only adding rids for full framework TFMs if the project.json does not have runtimes
 2016-12-19 16:20:12 -08:00
Krzysztof Wicher
9e76d6ffb5 new NuGetVersion[0] -> Enumerable.Empty<NuGetVersion>() 2016-12-19 14:32:31 -08:00
Krzysztof Wicher
ccfb4135c4 Add error message when tool is not restored 2016-12-19 14:12:04 -08:00
Livar
2aa166b5d0 Merge pull request #5069 from livarcocc/version_attributes 
Making version an attribute for packagereference and dotnetclitoolreference
 2016-12-19 09:48:00 -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
b2ce6c794a Only adding rids for full framework TFMs if the project.json does not already have Runtimes in its Runtimes section. 2016-12-18 18:45:35 -08: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
Livar Cunha
52b45d0c49 Fixing tests and a couple of issues in the code due to Localization. 2016-12-16 23:59:58 -08:00
Livar Cunha
1be6365e56 Localizing Microsoft.DotNet.Cli.Utils. 2016-12-16 22:45:48 -08:00
Piotr Puszkiewicz
fddabd4a51 https://github.com/dotnet/cli/issues/5071 2016-12-16 22:45:48 -08:00
Piotr Puszkiewicz
4e861a9965 Sln.Inernal Loc 2016-12-16 22:45:48 -08:00
Piotr Puszkiewicz
2b983f916f dotnet-msbuild loc 2016-12-16 22:45:47 -08:00
Piotr Puszkiewicz
469abc2d96 Yet more migration 2016-12-16 22:45:47 -08:00
Piotr Puszkiewicz
91061c2296 more migration loc 2016-12-16 22:45:47 -08:00
Piotr Puszkiewicz
5cfed1a787 Localize Migration 2016-12-16 22:45:47 -08:00
Piotr Puszkiewicz
e7487cab97 Microsoft.DotNet.Configurer 2016-12-16 22:45:47 -08:00
Scott Addie
e25e387f1f Add hyphen in Welcome to .NET Core Telemetry paragraph - commandline 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 Cunha
e1c0bbe0f7 Making version an attribute for packagereference and dotnetclitoolreference. 2016-12-16 19:13:37 -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
a9ca6d8c5b Merge pull request #5062 from livarcocc/clean_empty_targets_migration 
Added a clean empty targets method to CleanOutputProjectRule
 2016-12-16 18:07:37 -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
55f48ebdac Merge pull request #5063 from nguerrera/xlf-update 
Update xlf with new/removed/modified strings
 2016-12-16 14:26:39 -08:00
Livar
af3cab66f4 Merge pull request #5034 from livarcocc/duplicate_resource_migration 
Adding a Exclude @(EmbeddedResource) during migration to EmbeddedResources
 2016-12-16 14:26:07 -08:00
Nick Guerrera
d54ee6ff82 Update xlf with new/removed/modified strings 2016-12-16 13:32:48 -08:00
Livar Cunha
d6d6fc612b Added a unit test for cleaning empty targets. 
Added a clean empty targets method to CleanOutputProjectRule that removes any targets without content inside of them from the csproj.
 2016-12-16 13:31:42 -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
Livar Cunha
e710958b79 Adding a Exclude @(EmbeddedResource) during migration so that we don't get duplicate resources when building migrated apps. 2016-12-15 11:17:20 -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
Livar Cunha
56dd76bdb0 Adding Update under Content for BuildOptions as well, but limiting this change only to Web Apps at the moment, because regular SDK does not have Content Include=**/* in place yet. 2016-12-13 16:45:40 -08:00
Livar Cunha
a22f4be938 Adding a UpdateContextTransform that generates items with the Update attribute set instead of Include. Also, removed the Exists condition for published content, because now that we are using Update, that check is not needed. I left the option to set a condition on the metadata though. 2016-12-13 16:45:39 -08:00
Livar Cunha
84682562bf Adding a condition to Content CopyToPublishDirectory to validate that the file exists before trying to copy it to output, to keep the same functionality as it existed in PJ. In MSBuild world, without this condition, CopyToPublishDirectory will fail. 2016-12-13 16:45:39 -08:00
Livar
0caae96daf Merge pull request #5014 from dotnet/shanselman-patch-1 
projetfactory -> "projectfactory"
 2016-12-13 16:35:02 -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
Scott Hanselman
8ece346385 projetfactory -> "projectfactory" 
Mispelling that shows up with "-v diag"
 2016-12-13 14:43:18 -08:00
Piotr Puszkiewicz
2fbafe6f3f Remove StreamForwarder from CLI tests (#4936) 
* WiP

* Replace StreamForwarder with OutputDataReceived

* Add build logging around test execution

* add newlines

* Add handling for the null terminator while maintaining empty lines

* Extra Diag

* Verbose logging for VS Test Console

* Fix asset file locking tests

* Add testcommand timeout + improve dotnet-new tests

* WiP

* Welcome, JoSequ!

* Fix failing tests

* Clean out diagnostics writelines

* self-PR1
 2016-12-13 14:15:35 -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
Livar
bd590f51e6 Emitting PackageId whenever we emit AssemblyName. We need to do this to preserve the behavior from PJ where the package id matched the containing PJ folder name. In MSBuild, PackageId will match AssemblyName, unless it is explicitly specified. (#4990) 2016-12-09 16:10:16 -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
Piotr Puszkiewicz
70c8ecbf16 Merge branch 'rel/1.0.0' into migrate_pj_without_frameworks 2016-12-09 00:30:36 -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
Livar Cunha
bb1bceb8bb When we had a project.json without frameworks, we were failing to show the appropriate error message because when we were generating the error message itself we tried to access the project context (which requires a framework in the PJ). This fix makes the ProjectContext optional to add the migration error. 2016-12-08 19:53:35 -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 Cunha
9d96bf8c20 Adding GenerateRuntimeConfigurationFiles when migrating a test project. 2016-12-05 18:23:34 -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
Nick Guerrera
d1ffd87edd Merge pull request #4923 from nguerrera/xlf2 
Add more xlf files for new strings
 2016-12-05 14:57:21 -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
0ffa77a76b Merge pull request #4925 from livarcocc/remove_manual_dependency 
Remove the dependency to System.Runtime.Serialization.Xml
 2016-12-05 13:12:31 -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
Livar Cunha
6e65611fd9 Remove the dependency to System.Runtime.Serialization.Xml now that MSBuild dependencies are correct. 2016-12-05 11:59:58 -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
Piotr Puszkiewicz
caad95491a Fix output race (#4911) 
* Fix output race

TestCommand starts the test process before wiring up stderr & stdout. This change delays process start until after the wireup is finished so that the test process cannot shut down before we have wired up output redirection.

* Bypass stream forwarder when it fails to attach to a process

CLI has tests failing errenously when, due to timing issues, the StreamForwarders fail to attach to a process because it managed to exit before attachment occurs. 

We tried attaching the forwarders prior to Process Start but this proved impossible because the OUT and ERR streams are not available to attach before the process starts. 

This exposes a fundamental flaw in our output redirection mechanisms. We should probably move to using https://msdn.microsoft.com/en-us/library/system.diagnostics.process.outputdatareceived.aspx or a similar mechanism. However, I don't know that @brthor hadn't considered and discarded this approach.

For the time being I am attempting to make tests more deterministic by capturing the associated exceptions and moving to a different mechanism when StreamForwarders are not available.

Opened https://github.com/dotnet/cli/issues/4913 to track the broader issue.

* File.Copy is not atomic...
 2016-12-04 11:54:29 -08:00
Livar
ac4f903731 Merge pull request #4897 from livarcocc/no_publish_iis 
Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk
 2016-12-04 09:36:52 -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
Rohit Agrawal
4311926366 update nuget to 4.0.0-rc2 (dev build 2067) (#4904) 2016-12-02 19:19:54 -08:00
Livar Cunha
7583bcb2fd Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk 2016-12-02 10:41:25 -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
Martin Andreas Ullrich
4af30914c9 Show meaningful error when failing to migrate invalid scripts (#4842) 2016-11-30 20:36:13 -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
Justin Goshi
8afb8ebf31 sln reader/writer (#4870) 
* Snap of sln reader/writer from https://github.com/mono/monodevelop

* Remove unnecessary code

* Create a new test asset with an sln file because adding an sln to an existing one broke other tests

* Remove commented out line

* Removing unneeded PropertyGroup per PR comments

* Update the license

* Fixing the license
 2016-11-30 14:08:28 -10: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
Livar
325b849858 Merge pull request #4814 from livarcocc/invoke_tool_cli_fx 
Making Project Tools use the CLI shared runtime
 2016-11-25 16:12: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
Livar
9862fbb4d7 Checking that the lock file exists before trying to acquire the lock for it. (#4797) 
* Checking that the lock file exists before trying to acquire a lock for it, which takes up to 30 seconds.

* Adding a test for failing when reading the lock file and it does not exists.
 2016-11-23 22:59:54 -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
Livar
923320b66b Merge pull request #4829 from jeffkl/4753 
Move project.lock.json during migration
 2016-11-23 14:02:35 -08:00
Livar Cunha
99f30b3ea8 Fixing a bug I had in the Muxer where I was going to high in the folder structure and missing the version part of it. 2016-11-23 11:04:33 -08:00
Krzysztof Wicher
592af9dd61 Extract error messages to separate class 2016-11-23 10:41:30 -08:00
Livar Cunha
d5f7efbe86 Addressing code review comments. 2016-11-23 10:19:00 -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
Livar Cunha
dc87680337 Making Project Tools use the CLI shared runtime if they have the prefercliruntime in the root of their package. This allows for project tools to not have to change when a new runtime comes up as long as they are compatible with the runtime that the CLI is using. 2016-11-23 09:25:47 -08:00
Livar
da0e7b744b Revert "update NuGet to 4.0.0-rc2 build (#4802)" (#4818) 
This reverts commit 0bafbd061e.
 2016-11-23 09:01:32 -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
Krzysztof Wicher
5d1deeeea1 test project - almost finished - not all review changes included 2016-11-22 14:46:32 -08:00
Krzysztof Wicher
8416085b3a Add test assets for testing and tiny bugfix 2016-11-22 14:45:29 -08:00
Krzysztof Wicher
7edcf556d7 remove currently unused code 2016-11-22 14:45:29 -08:00
Krzysztof Wicher
ca33d98531 add dotnet add p2p command 2016-11-22 14:45:29 -08:00
Krzysztof Wicher
e4ccc0ff9b Add dotnet-add command 2016-11-22 14:45:29 -08:00
Krzysztof Wicher
c6bd3eeec6 rename command name to dotnet-add-p2p 2016-11-22 14:42:04 -08:00
Shannon
703863637e removes old code refs to the msbuild extension usage 2016-11-22 14:42:04 -08:00
Shannon
f69eed98eb Adds initial code for addingn and removing a package reference 2016-11-22 14:42:04 -08:00
Rob Relyea
0bafbd061e update NuGet to 4.0.0-rc2 build (#4802) 2016-11-22 00:51:12 -08:00
William Li
98a3974557 Add the path to the dotnet being used to dotnet--info 
Utilize ApplicationEnvironment.ApplicationBasePath of
DotNet.PlatformAbstractions
 2016-11-20 10:29:23 -08:00
Scott Carlton
706b8a802d Extract localizable strings from dotnet-run (#4769) 
* Localization changes for dotnet-run

* Fixed LocalizableString to correctly be LocalizableStrings

* Localization changes for dotnet-restoreProjectJson

* Loclization changes for dotnet-restore command.

* Update Program.cs
 2016-11-19 11:45:46 -08:00
Livar
a57b9e5d01 Merge pull request #4782 from dasMulli/dead-code-in-tool-resolving 
Remove unused lock file read from tool resolving logic.
 2016-11-18 19:30:50 -08:00
Livar
05670d6d7f Workaround for empty restore.txt file under .tam (#4771) 
* For some reason, specially in CI, the restore.txt file under .tam is ending up empty. As a workaround for it, I am going to retry the restore if that happens.

* Change how we diff the existing files in the TAM by using the explicit list from the .txt file.

* Using Nuget ReplaceWithLock utility to get around a concurrency issue on windows.
 2016-11-18 19:28:38 -08:00
dasMulli
4ee8317834
Remove unused lock file read from tool resolving logic. 2016-11-19 00:25:26 +01:00
Livar
dd2fe2fac5 Merge pull request #4777 from dasMulli/bugfix/assembly-attributes-migration 
Migration: Handle different variations of specifying assembly attributes.
 2016-11-18 13:56:30 -08:00
Piotr Puszkiewicz
5fb561ee50 Merge pull request #4750 from mattscheffer/locWork 
Extract Localizable strings from dotnet-build
 2016-11-18 12:49:14 -08:00
dasMulli
acb4d64c07
Migration: Handle different variations of specifying assembly attributes. 2016-11-18 18:05:00 +01:00
dasMulli
09cb9bf607
Show migrate, nuget and msbuild commands in dotnet-help. 
Also split the help text into commands and advanced commands sections
 2016-11-17 19:11:41 +01:00
v-masche
b205bfdc02 Fixing the namespace to match the Program.cs in the same folder 2016-11-16 16:39:44 -08:00
v-masche
b0077f4f25 Adjusted ProjectArgumentDescription to be a single string rather than divided into two strings. 2016-11-16 14:57:57 -08:00
Livar
09f62cdd7e Merge pull request #4741 from piotrpMSFT/piotrpMSFT/issues/4739-xprojUser 
add *.xproj.user to backup file types
 2016-11-16 09:30:17 -08:00
Livar
9847196c95 Merge pull request #4737 from livarcocc/migrate_authors 
Adding Authors migration.
 2016-11-16 09:29:13 -08:00
Livar
11f871b715 Merge pull request #4733 from livarcocc/migrate_adds_rids_for_desktop 
Emitting runtime identifiers if the source project has any full framework TFMs
 2016-11-16 09:29:01 -08:00
Piotr Puszkiewicz
d39ee4a463 add *.xproj.user to backup file types 2016-11-16 01:10:55 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735) 
* Remove unused project.json and .xproj files

* Update the test msi script
 2016-11-15 16:12:19 -10:00
v-masche
3b8567248a Extract localizable strings from dotnet-build 2016-11-15 17:12:26 -08:00
Livar Cunha
c364f27346 Adding Authors migration. 2016-11-15 16:36:04 -08:00
Livar Cunha
9513428013 Emitting runtime identifiers if the source project has any full framework TFMs. 2016-11-15 14:07:35 -08:00
Krzysztof Wicher
7a3bc96f75 Fix 4508: CLI verbs that call into msbuild should control their output (#4719) 
* Fix 4508: CLI verbs that call into msbuild should control their output

* fix failing tests + tiny bufix in dotnet test
 2016-11-15 11:56:39 -08:00
Krzysztof Wicher
43df9a170d Fix 4655: Migrate errors are not getting put in formatted output (#4718) 
* Fix 4655: Migrate errors are not getting put in formatted output

* Move test asset to NonRestoredTestProjects

* use group test asset manager: NonRestoredTestProjects
 2016-11-15 09:39:58 -08:00
Piotr Puszkiewicz
bf425a6f0a Removing dotnet-test-mstest when migrating because that package is no longer needed. (#4690) 2016-11-14 14:59:59 -08:00