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

3156 commits

Author SHA1 Message Date
dasMulli
0edee4a373
Fix in German translation for dotnet-add-reference 2017-01-21 17:02:01 +01:00
Dustin Campbell
0a62481cc0 Create backup folder in the directory where 'dotnet migrate' is executed (#5306) 
* Create backup folder in the directory where 'dotnet migrate' is executed

With this change, 'dotnet migrate' will create the backup folder in the workspace directory rather
than the parent of the workspace directory. This solves two problems:

1. It makes it easier for the user where the backup is -- it's in the directory they targeted with
'dotnet migrate'.
2. It solves a problem of file oollisions with global.json files when migrating multiple projects.
Consider the following directory structure:

    root
        |
        project1
            |
            global.json
            |
            src
                |
                project1
        project2
            |
            global.json
            |
            src
                |
                project2

    Prior to this change, running 'dotnet migrate' project1 and then running it again in project2
    would have caused an exception to be thrown because the migration would try to produce a backup
    folder like so:

    root
        |
        backup
        |  |
        |   global.json
        |   |
        |   project1
        |   |
        |   project2
        |
        |
        project1
            |
            src
                |
                project1
        project2
            |
            src
                |
                project2

    Now, we produce the following structure, which has no collisions:

    root
        |
        project1
            |
            backup
            |   |
            |   global.json
            |   |
            |   project1
            |
            src
                |
                project1
        |
        project2
            |
            backup
            |   |
            |   global.json
            |   |
            |   project2
            |
            src
                |
                project2

In addition, to help avoid further collisions, a number is appened to the backup folder's name if
it already exists. So, if the user runs dotnet migrate again for some reason, they'll see backup_1,
backup_2, etc.

* Fix test helper

* Fix foolish bug causing infinite loop

* Fix up a couple more tests

* Rework MigrationBackupPlan to process all projects at once

* Fix up tests

* Still fixing tests

* Compute common root folder of projects to determine where backup folder should be placed

* Fix typo

* Fix test to not look in backup folder now that it's in a better location
 2017-01-21 01:58:28 -08:00
Piotr Puszkiewicz
04a7fca9fc Fixing argument parsing in add package command (#5421) 
* Fixing argument parsing in add package command

* Adding check to throw if extra args were passed

* Removing string and adding test cases for dotnet add package command

* Add new test to test.sln, and fix naming, and clean csproj
 2017-01-21 00:11:18 -08:00
Piotr Puszkiewicz
4bd8344da1 Merge branch 'rel/1.0.0' into add-rd 2017-01-20 18:36:05 -08:00
Justin Goshi
b2c51b7269 Do not add duplicate solution folders or project directories (#5377) 
* Do not add duplicate solution folders or project directories

* Fix the algorithm for removing empty solution folders

* Improving code by adding description methods. To address PR comments.
 2017-01-20 18:34:37 -08:00
Justin Goshi
baecbd8d43 WIP 2017-01-20 17:37:11 -08:00
Piotr Puszkiewicz
fe290f1e26 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 14:08:49 -08:00
Piotr Puszkiewicz
26aa05cfea Merge pull request #5394 from livarcocc/migrate_global_json 
Handle dotnet migrate global.json
 2017-01-20 14:07:27 -08:00
Justin Goshi
33c962a481 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 12:21:43 -08:00
Justin Goshi
717d0a45fa Moving existing csproj files with same name as migration output to backup 2017-01-20 12:21:04 -08:00
Livar
e63867d324 Merge branch 'rel/1.0.0' into add_help_message_to_migrate 2017-01-19 18:40:55 -08:00
Krzysztof Wicher
8ef670161b isolate exclusive folder access pattern into separate class 2017-01-19 16:43:54 -08:00
Krzysztof Wicher
e271b4a818 InvalidOperationException -> ArgumentException 2017-01-19 15:56:16 -08:00
Livar Cunha
96f64e1708 Updating the help string based on PR feedback. 2017-01-19 13:18:47 -08:00
Justin Goshi
56c3010f72 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-19 13:17:05 -08:00
Livar Cunha
13e9e697c9 Adding an extra message to the migrate result to direct people to a place where they can get help for their migrated projects. 2017-01-19 12:41:48 -08:00
Livar
c4e2c35d25 Merge branch 'rel/1.0.0' into migrate_global_json 2017-01-19 12:25:35 -08:00
Krzysztof Wicher
243f92aa47 fix some flakiness around test assets 2017-01-19 11:37:54 -08:00
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
Piotr Puszkiewicz
05956f6efa Merge branch 'rel/1.0.0-rc3' into ragrawal/updatesdktrial 2017-01-18 13:41:50 -08:00
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
Livar Cunha
7802b957d3 Adding a second workaround for the build failure. Same fix as the other one though. 2017-01-18 10:17:37 -08:00
Livar
073daaf450 Merge branch 'rel/1.0.0' into localization 2017-01-18 10:03:18 -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
Livar Cunha
f765a02865 Fix compile break. 2017-01-17 13:44:31 -08:00
Livar Cunha
2161364116 Adding a test for a project that has a package dependency whose name is also the name of a folder in the repo. 
Moved the test to dotnet-migrate.Test and modified the code that find possible P2P dependencies to actually check if the folder holds a project.
 2017-01-17 13:14:18 -08:00
Rohit Agrawal (NUGET)
337d579949 update nuget and sdk to run a trial build 2017-01-17 11:08:17 -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
Livar
9095743ff7 Merge pull request #5356 from piotrpMSFT/piotrpMSFT/issues/5345 
Fixes #5345
 2017-01-16 17:12:46 -08:00
Livar
557999a5bd Merge pull request #5352 from livarcocc/skip_project_references 
Skipping project dependencies check when the skip-project-references flag is passed
 2017-01-16 16:20:39 -08:00
Piotr Puszkiewicz
82dcdada50 Fixes #5345 2017-01-16 16:13:58 -08:00
Livar Cunha
e1f355065d Moving the project dependencies construction to after we check for the skip project reference check, so that we really don't look for P2P projects when the flag is passed. 2017-01-16 15:16:31 -08:00
Livar Cunha
b8da3b9a87 Updating the versions of xunit 2.2.0-beta5-build3474 and xunit runner to 2.2.0-beta5-build1225. 2017-01-16 13:08:40 -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
Livar Cunha
18a3dd60b5 Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped. 2017-01-12 18:23:35 -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
a9c5f4e90a Merge pull request #5293 from dotnet/dev/jgoshi/issue5253 
Migration: do not inject built in compile includes that the SDK does
 2017-01-12 15:00:03 -08:00
Pranav K
80c435e6a1 Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation 2017-01-12 13:49:28 -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
Livar Cunha
12abcf7208 Adding a few more packages that were not in the manifest and moving some tests around. 2017-01-12 11:38:05 -08:00
Livar Cunha
a0aa8150de Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one. 2017-01-12 11:38:05 -08:00
Livar Cunha
89fba856e8 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. 2017-01-12 11:38:05 -08:00
Justin Goshi
71da7f6a45 Migration: do not inject built in compile includes that the SDK does 2017-01-12 11:22:41 -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
Justin Goshi
03be0e56d4 Migration: Do not add RIDs for Library projects (#5279) 
* WIP

* Do not add runtime identifiers for libraries

* Reusing an existing test project

* Fix up tests
 2017-01-11 17:05:12 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -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
635c0a192a Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 15:35:25 -06:00
Eric Erhardt
6f506b331c Fixing build break with latest NuGet packages. 2017-01-10 13:46:26 -06: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
e71c58c156 Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it. 2017-01-10 10:43:05 -08:00
Eric Erhardt
5035320247 Add NuGet version to DependencyVersions.props. 2017-01-10 10:43:14 -06: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
Rohit Agrawal
5bbfbfeeed update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 (#5214) 
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5

* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.

* add a nuget dependency so migrated project has packageref and generates an assets file on restore
 2017-01-06 16:28:04 -08:00
Eric Erhardt
0cfc54c377 First time experience populating the NuGet cache with 1.1 packages. 2017-01-06 17:45:34 -06:00
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
Livar
5bdbe354b2 Merge pull request #5226 from livarcocc/migrate_full_framework 
Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs
 2017-01-06 14:48:35 -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
Piotr Puszkiewicz
bf4588b6fc Add PJ support to TestAssets (#5109) 
* Add PJ support to TestAssets

* Cleaning the test assets is hard, so throwing instead

* better assets filter

* PR feedback

* PR Feedback

* Fix NullRef

* Move lock to surround action + file read/write
 2017-01-06 01:40:26 -08: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 Cunha
7e5f18b584 Fixing full framework tests. 2017-01-05 22:55:43 -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
Livar Cunha
abe7641f03 Migration will now pick win7-x86 as the RuntimeIdentifier to be used by Full Framework TFMs when no RIDs exist in the source PJ. This will allow build/publish etc to continue working in csproj without extra RIDs parameters in the command line. 2017-01-05 16:52:02 -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
Livar
8effe48566 Merge pull request #5212 from livarcocc/update_sdk_with_globbing 
Updating the SDK to an SDK that includes globing for source and resources
 2017-01-05 13:49:32 -08:00
Ankit Mishra
c331dc3b97 Preparing for dotnet remove PR 2017-01-05 13:05:36 -08:00
Livar
bf47363a5f Merge pull request #5219 from livarcocc/remove_define_constants_release 
Adding Release to the sdk defined constants so that we don't emit it anymore
 2017-01-05 12:46:56 -08:00
Livar Cunha
3b69588db2 Picking up the latest SDK and adding back some named parameters to MigrateBuildOptionsRule for clarity. 
Updating the tool project to use BuiltProjectOutputGroupOutput instead of content because of SDK issue https://github.com/dotnet/sdk/issues/588
 2017-01-05 12:31:49 -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
Livar Cunha
69e963669f Adding Release to the sdk defined constants so that we don't emit it during migration anymore. 2017-01-05 11:46:02 -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
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
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668) 
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
 2016-11-11 21:46:29 -10:00
Livar Cunha
df755b5554 Removing dotnet-test-mstest when migrating because that package is no longer needed. 2016-11-11 10:52:33 -08:00
Livar
43dfa6b8ba Updating script migration to use the correct BeforeTargets. (#4680) 2016-11-10 18:24:35 -08:00
Piotr Puszkiewicz
b354e1a3c6 Eliminate imports from CLI, where possible (#4673) 
* Remove imports from dotnet.dll

* Add back dotnet5.4 to dotnet.dll due to AppInsights

* dotnet-cli-build.csproj: OData
redist.csproj: AppInsights
 2016-11-10 10:19:37 -08:00
Livar
9869b82412 Merge pull request #4662 from livarcocc/remove_dotnet_test_xunit_migration 
Removing dotnet-test-xunit when migration from project.json to csproj
 2016-11-09 11:11:17 -08:00
Livar Cunha
7f549314ff Removing dotnet-test-xunit when migration from project.json to csproj, as that package is no longer needed. 2016-11-09 09:52:52 -08:00
Piotr Puszkiewicz
b918b2a6b6 Invoking a command waits up to 30s for NuGet or another process (#4657) 
* Invoking a command waits up to 30s for NuGet or another process

* PR Feedback
 2016-11-08 23:23:13 -08:00
Livar
a700604b93 Merge pull request #4654 from 333fred/fix-help-text 
Cleaned up dotnet migrate help text
 2016-11-08 21:05:21 -08:00
Livar
312559ccdc Merge pull request #4636 from Faizan2304/xunitTemplateFix 
Update version of xunit adapter in test assets and xunit template
 2016-11-08 14:42:47 -08:00
Fredric Silberberg
660417aaed
Cleaned up help text. Fixes #4653. 2016-11-08 14:39:19 -08:00
Faizan Ahmad
cc450ed8ce Update the version for migration project 2016-11-08 23:05:43 +05:30
Livar Cunha
ef90667375 Hoisting FrameworkAssemblies for desktop frameworks during migration. 2016-11-07 16:16:48 -08:00
Livar Cunha
c7841909fd Updating the CLI versino to preview4. 2016-11-07 10:39:59 -08:00
Faizan Ahmad
91708c4d89 Updated new version of Microsoft.TestPlatform.Build 2016-11-07 18:11:43 +05:30
Faizan Ahmad
f3cffa0bf4 Update version of xunit adapter and runner 2016-11-07 14:50:08 +05:30
Parallels
d68341b92d Removing DocumentationFile path from migration and one test asset. 2016-11-04 11:51:43 -07:00
Piotr Puszkiewicz
cb7c9360b7 Bump mstest template 2016-11-04 10:35:54 -07:00
Piotr Puszkiewicz
24596b23ae 02->2 2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c Final Version Numbers 2016-11-04 10:09:22 -07:00
seancpeters
d1e0d2bde3 Removed Project_Readme from CSharp_Web (#4617) 
* Removed Project_Readme from CSharp_Web
Added the package fallback target to CSharp_Web

* Added the $if$ i missed when I copy-pasted.

* Removed the if-else
 2016-11-03 23:03:29 -07:00
seancpeters
40c34f891a Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions (#4585) 
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions

* Fixed merge conflicts. Had to re-update the Sdk version in one place.

* re-migrate dotnet.dll

* Revert Performance Test Projects

* Fix test test

* Add missing WithRuntime

* Disable failing test test
 2016-11-03 22:12:33 -07:00
Piotr Puszkiewicz
51cb0ab4d5 Remove deprecated nupkgs, pack in-place to enable signing (#4615) 
* Remove deprecated nupkgs, pack in-place

* Add back target specifiers.

* fix suffix
 2016-11-03 22:11:58 -07:00
Rob Relyea
f961fef8e0 update NuGet in CLI to 4.0.0.2048 (#4614) 
* update NuGet in CLI to 4.0.0.2047

* update NuGet in CLI to 4.0.0.2048
 2016-11-03 22:11:44 -07:00
Livar
d6eef01015 Adding a tool migration for BundleMinifier.Core to move all version of the tool to 2.2.301 during migration. (#4613) 2016-11-03 19:55:52 -07:00
Livar
28ba817dc1 Merge pull request #4602 from NTaylorMullen/nimullen/versionchange 
Change ASP.NET tool version to reflect project format.
 2016-11-03 18:39:55 -07:00
Livar Cunha
336e29075f Adding MSTest to the exclusion list of project.json because some test projects still depend on it and they are build with pj stage0. 2016-11-03 17:05:20 -07:00
N. Taylor Mullen
07c2e0ced0 Change ASP.NET tool version to reflect project format. 2016-11-03 11:46:43 -07:00
Livar
de5da5870f Marking hoisted P2P projects with a FromP2P attribute. (#4598) 2016-11-03 10:27:51 -07:00
Faizan Ahmad
ef8e59231a Fix for issue https://github.com/Microsoft/vstest/issues/175 2016-11-03 19:20:56 +05:30
Livar
14c285db1c Merge pull request #4583 from NTaylorMullen/nimullen/removert 
Remove Razor.Tools/Razor.Design from migration logic.
 2016-11-02 21:21:20 -07:00
Livar
d84c89be15 Merge pull request #4589 from livarcocc/cleanup_migration 
Cleanup migration
 2016-11-02 17:03:29 -07:00
Justin Goshi
499579ddb8 Rename test templates for casing consistency (#4587) 2016-11-02 13:44:28 -10:00
Livar
14ad04a400 Merge pull request #4580 from jeffkl/telemetry 
Some unit tests for MSBuild telemetry
 2016-11-02 16:05:43 -07:00
Jeff Kluge
6a4d49e227 Remove quotes from /Logger argument because the argument escaper will do it for me 2016-11-02 15:19:21 -07:00
N. Taylor Mullen
411dd02923 Remove Razor.Tools/Razor.Design from migration logic. 
- Razor.Tools/Razor.Design will not be shipping with MSBuild support for the upcoming release.
 2016-11-02 15:16:57 -07:00
Livar Cunha
4e1f2f2b20 Removing TFM specific defines for migrated projects, since they are not being set in the SDK itself. 2016-11-02 15:05:45 -07:00
Livar
f84ce89e30 Merge pull request #4558 from Faizan2304/enablevstest 
Enable disabled vstest and test verb test.
 2016-11-02 13:59:45 -07:00
Jeff Kluge
29bd7bf27a More line lengths 2016-11-02 13:09:50 -07:00
Jeff Kluge
a2d438288e Reduce line lengths 2016-11-02 13:06:44 -07:00
Justin Goshi
d1772f6ed4 Add mstest support (#4572) 
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* WIP adding new mstest templates

* Auto-inject mstest dependencies when testrunner is set to mstest

* WIP trying to get new web test to work

* Get dotnet new -t Web test to pass

* Remove whitespace and accidentally added (redundant) tests

* Shorten test method name
 2016-11-02 08:49:45 -10:00
Faizan Ahmad
5c5f593449 Merge branch 'rel/1.0.0' into enablevstest 2016-11-02 23:50:44 +05:30
Livar Cunha
0c833f5349 Making the default exclude option empty, so that by default, we don't set any excludes for compile or embed during migration. 2016-11-02 10:11:37 -07:00
Jeff Kluge
efa1cef866 Some more try...catches 2016-11-02 08:04:02 -07:00
Faizan Ahmad
4af8d52a23 Updated the version of microsoft.testplatform.cli package 2016-11-02 18:11:36 +05:30
Justin Goshi
3f7a21339f Fix typo in dotnet test help message 2016-11-01 18:57:32 -07:00
Krzysztof Wicher
d520160ce3 Merge pull request #4554 from krwq/fix_lib_wo_netstandard 
When Library add reference to NETStandardLib if not present
 2016-11-01 16:50:47 -07:00
Livar
aaa343a1c8 Merge pull request #4566 from livarcocc/migrate_unqualified_references 
Migrating unqualifing references as projects
 2016-11-01 15:54:45 -07:00
Krzysztof Wicher
e3bc102b06 When Library add reference to NETStandardLib if not present 2016-11-01 15:52:24 -07:00
Krzysztof Wicher
875e275e38 Revert "When Library add reference to NETStandardLib if not present" 
This reverts commit 57d79bb2d3.
 2016-11-01 15:45:14 -07:00
Krzysztof Wicher
57d79bb2d3 When Library add reference to NETStandardLib if not present 2016-11-01 15:34:17 -07:00
Justin Goshi
155ef033f2 Migrate: auto-inject test dependency version (#4565) 
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* Address PR comments
 2016-11-01 12:10:51 -10:00
Livar Cunha
82ff6397f5 Migrating unqualifing references as projects if we find a matching project. Without this, we have project references being migrated as package references. 2016-11-01 14:17:12 -07:00
Faizan Ahmad
0995daf83e 1) Added test to cover xunit scenario 
2) Added log in multi tfm test to root cause the issue where it is failing for net46
 2016-11-02 01:45:44 +05:30
Livar Cunha
c7858afc48 Attempting to actually fix the build this time. We were not pointing to the right packages cache before. 2016-11-01 12:46:29 -07:00
Faizan Ahmad
6688ba22a4 Updated the package version of testplatform in redist.csproj 2016-11-01 18:30:39 +05:30
Livar Cunha
a95ddb4074 Addressing code review comments. 2016-11-01 00:49:03 -07:00
Livar Cunha
9139c4006b Fixing full framework tests 2016-11-01 00:31:21 -07:00
Livar Cunha
c2f60cede4 Updating the SDK to the latest. 2016-11-01 00:29:54 -07:00
Justin Goshi
f9493545dc Address PR comments to improve test readability and reliability 2016-10-31 20:50:52 -07:00
Justin Goshi
45ccc74ace Merge from rel/1.0.0 2016-10-31 20:00:15 -07:00
Livar
3c52adf53d Merge pull request #4537 from livarcocc/rename_tools_packages 
Rename tools packages
 2016-10-31 18:39:32 -07:00
Jeff Kluge
595a768e30 Custom logger for MSBuild to receive telemetry events (#4551) 
* Upgrade MSBuild references to 15.1.0-preview-000370-00

* Custom logger for MSBuild to receive telemetry events

Had to make the telemetry session ID a static variable so that the forwarding app could use it.

I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
 2016-10-31 16:16:39 -07:00
Justin Goshi
4cd74bff88 Only add the xunit references if the test running is xunit 2016-10-31 15:55:22 -07:00
Justin Goshi
4ea37c91a8 Migrate: add package dependencies to test projects 2016-10-31 13:59:47 -07:00
Livar Cunha
167aaad655 Fixing rebase problems. 2016-10-31 13:22:37 -07:00
Livar Cunha
be2ab211f1 Addressing code review comments. 2016-10-31 12:39:03 -07:00
Livar Cunha
b16c9018b6 Adding a map of asp tools packages that tells which versions we need to migrate and to what. Any package in that list, will also have its version updated. 2016-10-31 12:33:01 -07:00
Livar
5a621b53e2 Merge pull request #4540 from livarcocc/issue4492/migrateWeb 
Issue4492/migrate web
 2016-10-31 12:26:26 -07:00
Livar Cunha
b45a3ba698 Addressing code review comments by Adding an enum, renaming the PackageConstants and making the Sdk.Web version the same as the Sdk version. 2016-10-31 11:00:43 -07:00
Livar Cunha
c3b57f2e72 Changing the Sdk.Web version to match the current SDK version so that we can update them together. Also added the dotnet-web to the migrated tests. 2016-10-30 21:32:11 -07:00
Piotr Puszkiewicz
f53c51fc07 [WiP] enable /m by default (#4543) 
* MSBuild integration project + refactoring

* Feature Complete

* Change default target to an existing one
 2016-10-29 12:08:52 -07:00
Piotr Puszkiewicz
5ede3b6367 post migration cleanup (#4449) 
* Create tests

* Basic scenario working & tested

* Feature Complete

* prevent build of intentionally broken test asset

* Update migrate command backup

* PR Feedback

* Move negative test to negative test directory

* Fix tests

* make test output directories unique

* Merge Conflict

* make backup the default behavior

* Pass2Fail

* Remove tests' PJ dependency
 2016-10-29 01:58:37 -07:00
Justin Goshi
a4776a2b2c Migrate src and tools to csproj (#4538) 
Thanks for getting this in!
 2016-10-29 01:04:20 -07:00
Livar Cunha
9e88b811a0 Refactoring the ProjectTypeDetector to use the Project in the MigrationInputs. 2016-10-29 00:33:22 -07:00
Mike Lorbetske
e847389fc2 Update migration to use the web template as a base for web projects 2016-10-29 00:33:22 -07:00
Livar
22a5a15ba9 Merge pull request #4536 from krwq/outputNameIssue 
Migrating project with OutputName
 2016-10-28 20:55:18 -07:00
Livar
be8f2e212e Merge pull request #4519 from livarcocc/whitespace 
Adding whitespace to csproj and removing xml node from the beginning of it
 2016-10-28 20:54:58 -07:00
Livar Cunha
3752264b8e Pulling in the new msbuild based xunit template 2016-10-28 18:20:53 -07:00
Livar Cunha
59ac685dcd Updating the msbuild version to one with the preserve compilation context fix. 2016-10-28 18:19:41 -07:00
Livar Cunha
9e49ec2723 Replacing DeepClone with a call that creates a copy of the project using the template csproj under a new ProjectCollection everytime. 2016-10-28 18:19:40 -07:00
Bryan Thornbury
c9f9421b93 preserve whitespace 2016-10-28 18:19:39 -07:00
Krzysztof Wicher
e9e05006da Migrating project with OutputName 2016-10-28 17:27:42 -07:00
Justin Emgarten
54cad0b7a6 Updating nuget to 4.0.0-rc-2037 2016-10-28 17:13:29 -07:00
Livar
cbed94dbef Merge pull request #4517 from livarcocc/promote_project_dependencies 
Promote project dependencies
 2016-10-28 15:17:47 -07:00
Faizan Ahmad
a09690d8df 1) Added diag support 
2) Added log in test which are failing in windows machine for framework net46
 2016-10-28 20:15:38 +05:30
Faizan Ahmad
63a14fd3ab Merge from rel/1.0.0 2016-10-28 17:56:24 +05:30
Livar Cunha
fa6aa749bd Doing a tree traversal of all dependencies and creating a list that is then added to the project dependencies of the project. 2016-10-27 20:08:53 -07:00
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456) 
Removes *3 verbs, making msbuild the driver
 2016-10-27 18:46:43 -07:00
Livar
53dc665e9b Merge pull request #4505 from livarcocc/assembly_info_migration 
Assembly info migration
 2016-10-26 17:00:22 -07:00
Livar Cunha
43bf57531e Adding the MigrateAssembyInfo rule to the DefaultMigrationRuleSet. 2016-10-26 15:49:00 -07:00
Justin Goshi
68afda8e4d Handle "runtimes" section (#4503) 
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.

* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
 2016-10-26 22:23:40 +00:00
Livar Cunha
f863630fd8 Adding a rule that turns off assembly info generation for attributes already defined when migrating. 2016-10-26 13:55:15 -07:00
Faizan Ahmad
c7200f1599 Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 23:42:53 +05:30
Livar
4aa1c1bfb4 Merge pull request #4499 from eerhardt/FixRun3Project 
Fix dotnet run3 --project to pass the project to msbuild.
 2016-10-26 10:57:06 -07:00
Faizan Ahmad
679ea57acf Merge branch 'rel/1.0.0' into test3formultipletfm 2016-10-26 21:46:55 +05:30
Livar
7149c722b1 Merge pull request #4496 from livarcocc/issue_4486 
Merging metadata with different values
 2016-10-25 22:26:21 -07:00
Livar
8befd890d8 Merge pull request #4494 from livarcocc/migrate_target_package 
When determining the P2P dependencies, only use dependencies of type project
 2016-10-25 22:25:28 -07:00
Eric Erhardt
33ec55aee3 Fix dotnet run3 --project to pass the project to msbuild. 
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301.
 2016-10-26 00:04:40 -05:00
Livar Cunha
71aa93b164 Merging metadata with different values by setting the metadata values to be string joined and semi-column separated. This fixes the problem of having multiple mappings for the same file in a include/mappings. 2016-10-25 15:26:04 -07:00
Livar Cunha
175eaeb5c1 When determining the P2P dependencies, only use dependencies of type project. This prevents us from migrating a package dependency as a project dependency because of a project with the same name being present. 2016-10-25 13:09:06 -07:00
Faizan Ahmad
33caa408a1 1) Added support to run test from test3 verb for the project targeting multiple TFM 
2) Added test to address above change
3) Crossgen were creating problem for full CLR built assemblies. Removed All those assembly from Crossgen list.
4) Removed the line of code which were deleting Extensions folder under sdk folder as this folder contain trx logger dlls
 2016-10-25 20:10:18 +05:30
Livar
2cc007520d Merge pull request #4479 from livarcocc/projectdependencies_full_framework 
Making OutputPathCommandResolver work with MSBuild.
 2016-10-24 16:18:15 -07:00
Livar Cunha
1506bf3bf2 Changing the IProject OutputPath property to FullOutputPath. 2016-10-24 14:47:05 -07:00
Livar
f68670e13c Merge pull request #4438 from jeffkl/restore 
Reduce MSBuild verbosity for restore
 2016-10-24 12:49:07 -07:00
Livar Cunha
d61ebd3087 Making OutputPathCommandResolver work with MSBuild. 2016-10-24 12:41:27 -07:00
Livar Cunha
be419e3b70 Fixing project dependencies migration so that they are only conditioned when they where under a TFM in the project.json to begin with. 2016-10-21 18:00:17 -07:00
Livar
d8bf015d7c Merge pull request #4459 from livarcocc/package_files 
Package files
 2016-10-20 21:01:02 -07:00
Bryan Thornbury
5301f08423 turn on signing test (#4460) 
* turn on signing test

* fix the test

* test with xplat AssemblyOriginatorKeyFile

* tweak signassembly condition
 2016-10-20 20:15:42 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
ddef1fc424 Adding pack files migration. 2016-10-20 11:56:07 -07:00
Bryan Thornbury
ecbc45098d Add support for Migration defaults (#4242) 
* Add support for sdk props/targets defaults to Migration.

* fix the transform applicator

* remove transform applicator dependency on insertion order for item merges

* defaults constructor msbuild version change
 2016-10-20 11:00:41 -07:00
Livar
501d575aeb Merge pull request #4455 from livarcocc/update_sdk 
Updating the SDK version to the latest.
 2016-10-19 20:55:43 -07:00
Livar Cunha
368d7a19af Updating the SDK version to the latest. 2016-10-19 16:21:54 -07:00
Livar Cunha
22bc479927 Updating msbuild to 15.1.319-preview5 2016-10-19 12:43:21 -07:00
Livar
b7ac730a7f Merge pull request #4444 from livarcocc/update_templates 
Updating the msbuild templates in the CLI to use TargetFramework
 2016-10-18 17:39:03 -07:00
Livar Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07:00
Livar Cunha
440871bad0 Removing -t msbuild, now that the default template is msbuild. 2016-10-18 10:35:04 -07:00
Jeff Kluge
c98b6cc412 Reduce MSBuild verbosity for restore 
Remove the MSBuild logo
Set verbosity to minimal
 2016-10-18 09:10:26 -07:00
Eric Erhardt
1b6502848e Respond to PR feedback. 2016-10-17 21:03:09 -05:00
Eric Erhardt
cbeb5b9912 Report a meaningful error when trying to run a multi-TFM project. 
Add `--no-build` option to `dotnet run3` since even incrementally building a project takes a non-trivial amount of time.
 2016-10-17 21:00:58 -05:00
Justin Goshi
71666cc9b5 Auto add referenced assemblies for desktop migration 
* https://github.com/dotnet/cli/issues/4351

Auto add referenced assemblies for desktop migration. Adds the same ones
that the build for project.json does.

* Address PR comments

* Address CR comments

* Address CR comment

Use .ToList() instead of new List

* Fix a build break

Needed .noautobuild file in my test asset project

* Change the migrate test for desktop framework to windows only

* Reducing to 120 characters per line
 2016-10-18 01:02:10 +00:00
Piotr Puszkiewicz
cfcc97b3f0 Move Web template to csproj (#4429) 
* Move Web template to csproj

* PR Feedback

* Updated template
 2016-10-17 14:45:37 -07:00
Livar
6f62a8155c Merge pull request #4395 from livarcocc/projectdependenciescommandresolver 
Making Projectdependenciescommandresolver work with MSBuild
 2016-10-17 10:45:47 -07:00
Livar Cunha
3798102035 Changing the API to create the MSBuild project to LoadProject and removing some non-existing paths from the RepoDirectoriesProvider. 2016-10-17 08:43:47 -07:00
Livar Cunha
391d04c67a Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running. 2016-10-16 18:44:07 -07:00
Livar Cunha
ce812a64c2 Removing DotnetFiles from Cli.Utils. 2016-10-14 15:46:52 -07:00
Eric Erhardt
c3ddbba163 Rename restore3 --recursive to --no-dependencies to match the build3 option. 2016-10-14 17:28:58 -05:00
Livar Cunha
dab19ce57c Fixing msbuild.exe casing 2016-10-14 14:58:36 -07:00
Livar Cunha
99d6b1fd6d Adding some more tracing to tools command resolvers. 2016-10-14 12:56:18 -07:00
Livar Cunha
d779ab3e3f Fixing the tool used in the test that I changed when trying things out and fixing the code that sets environment variables in the command to check if the environment variable already exists before adding it. 2016-10-14 12:56:18 -07:00
Livar Cunha
318c9f3e44 Making ProjectDependenciesCommandResolver handle msbuild projects as well by using the ProjectFactory and IProject. 
Moving the CommandResolution classes that depend on msbuild back into Cli.Utils.

Updating the src projects to a netstandard compatible with Cli.Utils moving to netstandard1.5
 2016-10-14 12:56:18 -07:00
Justin Emgarten
bc82b16a01 Merge pull request #4406 from dotnet/emgarten/solutionRestore 
Adding recursive restore and solution level restore
 2016-10-14 11:18:24 -07:00
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382) 
Make csproj templates first-class in dotnet-new.
 2016-10-14 00:06:35 -07:00
Justin Emgarten
53b436c5d5 Updating NuGet to 3.6.0-rc-1984 2016-10-13 19:31:15 -07:00
Justin Emgarten
fcdc23233e Recursive restore and solution restore support 
This change adds support for restoring solution files with msbuild /t:Restore and dotnet restore3.
Restoring a project file will now recursively restore all dependency projects to match build.

Fixes https://github.com/dotnet/cli/issues/4252
Related to: https://github.com/NuGet/Home/issues/2993
 2016-10-13 19:18:02 -07:00
Bryan Thornbury
1926d0e4a4 fix null ref when only one item (#4390) 2016-10-12 16:01:22 -07:00
Bryan Thornbury
f79d78703b remove autounify, fix langversion (#4387) 
* remove autounify, fix langversion

* PR feedback
 2016-10-12 14:59:36 -07:00
Faizan Ahmad
578edc9350 Rebase with rel/1.0.0 2016-10-12 22:53:43 +05:30
Faizan Ahmad
4dd685a45c Addressed livar PR comment 2016-10-12 15:20:07 +05:30
Justin Emgarten
f2eef338db Updating NuGet to 3.6.0-rc-1979 2016-10-12 00:49:44 -07:00
Faizan Ahmad
391fff1f20 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-12 11:57:46 +05:30
Justin Goshi
07418af874 Fixes #4293 
https://github.com/dotnet/cli/issues/4293
 2016-10-11 18:25:47 -10:00
Eric Erhardt
ea092717ac Merge pull request #4369 from eerhardt/SingleTFM 
Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible.
 2016-10-11 20:59:48 -05:00
Justin Goshi
59f2483fd3 https://github.com/dotnet/cli/issues/4293 
Improve help text for commands that shell out to msbuild.
 2016-10-11 17:29:09 -07:00
Bryan Thornbury
924c2c2954 Fix Migration Imports (#4350) 
* Fix Migration Imports

* turn tests back on

* turn other tests back on

* test update

* update nuget version

* fix string join

* bump nuget version

* undo

* undo

* undo
 2016-10-11 15:22:18 -07:00
Eric Erhardt
b5329995d8 Merge branch 'rel' 2016-10-11 17:01:33 -05:00
Eric Erhardt
38753d42b0 Fix the tests for targeting netstandard1.3. 2016-10-11 16:01:03 -05:00
Justin Goshi
19abf66412 Fixes issue #4313 
Improve error messages for the migrate command
 2016-10-11 10:58:49 -10:00
Livar
4780eb667b Merge pull request #4374 from livarcocc/update_msbuild_to_316 
Updating the MSBuild version to 15.1.316-preview5.
 2016-10-11 11:40:17 -07:00
Piotr Puszkiewicz
28193c5f75 Merge pull request #4303 from dasMulli/feature/dotnet-clean-verb 
Added clean3 verb for msbuild based projects.
 2016-10-11 11:36:27 -07:00
Livar Cunha
7dec493a8a Updating the MSBuild version to 15.1.316-preview5. 2016-10-11 10:35:40 -07:00
Bryan Thornbury
0a889b2feb Merge pull request #4371 from brthor/brthor/typebuild 
Fix Migration type:build
 2016-10-11 10:09:28 -07:00
Eric Erhardt
edf2fc1f53 Merge pull request #4367 from eerhardt/NewSdk 
Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk.
 2016-10-10 20:31:58 -05:00
Bryan Thornbury
0bdd3bd59f type build, suppress parent, include, exclude working 2016-10-10 16:21:55 -07:00
Bryan Thornbury
c44e50dfc4 type build tests 2016-10-10 16:21:53 -07:00
Justin Goshi
48ae5d17ac Improve error messages for the migrate command 
https://github.com/dotnet/cli/issues/4313
 2016-10-10 15:38:25 -07:00
Livar
31c88e112f Merge pull request #4363 from livarcocc/update_msbuild_313 
Updating the msbuild dependencies to 15.1.313-preview5.
 2016-10-10 14:16:14 -07:00
Eric Erhardt
85a737c223 Respond to PR feedback. 
Small variable rename.
 2016-10-10 16:07:31 -05:00
Eric Erhardt
eec324a844 Move all CLI libraries to be single-TFM targeting netstandard1.3 where possible. 
Microsoft.Extensions.Testing.Abstractions is the only one I couldn't move to netstandard1.3 that should be.  But this library should be removed with the new `dotnet test` strategy.
 2016-10-10 15:57:08 -05:00
Eric Erhardt
93166dd77c Merge pull request #4361 from eerhardt/RemoveFsc 
Remove dotnet-compile-fsc.
 2016-10-10 14:17:29 -05:00
Eric Erhardt
633b56e448 Update Microsoft.NETCore.Sdk => Microsoft.NET.Sdk. 2016-10-10 14:04:30 -05:00
Livar Cunha
5ff4887dd1 Updating the msbuild dependencies to 15.1.313-preview5. 2016-10-10 09:55:30 -07:00
Livar Cunha
c2bce2e2cc Moving the InferLegacyRestoreRuntime method to Test.Utilities, since it is needed only by tests. 2016-10-10 09:52:39 -07:00
dasMulli
148319a3c2 Added clean3 verb for msbuild based projects. 2016-10-10 18:31:30 +02:00
Eric Erhardt
6cf0327875 Remove dotnet-compile-fsc. 
It's new home is https://github.com/dotnet/netcorecli-fsc/
 2016-10-10 11:23:46 -05:00
Faizan Ahmad
23af21d7bb Merge with rel/1.0.0 2016-10-10 15:29:35 +05:30
Livar Cunha
09d811fdbd Adding an OverrideRid property used in the GetRuntimeInfo task to override the rid of the CLI. This allows us to build for osx.10.11 when building on osx.10.12. 2016-10-08 11:45:19 -07:00
Bryan Thornbury
2727b191e3 Merge pull request #4310 from brthor/brthor/migrationreport 
Migration Report
 2016-10-07 11:01:06 -07:00
Livar Cunha
167470b1c9 Updating the SDK version, which we need to pick up the NuGetTargetMoniker fix. 2016-10-06 18:31:15 -07:00
Livar Cunha
6242db9b14 Moving msbuild dependencies to msbuild 15. 2016-10-06 17:29:07 -07:00
Bryan Thornbury
fbaf9a679e Project Migration Report 2016-10-06 15:56:15 -07:00
Rohit Agrawal
28bd507f40 update nuget and sdk to 3.6.0-rc-1954 and 1.0.0-alpha-20161006-3 (#4332) 2016-10-06 09:35:58 -07:00
Faizan Ahmad
3f271e1215 Merge branch 'rel/1.0.0' into clitest3verb 2016-10-06 17:50:59 +05:30
Sridhar Periyasamy
5c6e3a05fb Merge pull request #4305 from dotnet/sridhar-ms/migrate-p2p-fix 
Fix P2P migration and migrate folders in global.json
 2016-10-05 20:59:39 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Bryan Thornbury
d0b28bc7ad remove lock file workaround 2016-10-05 17:02:32 -07:00
Nate McMaster
b38f644347 Merge pull request #4326 from dotnet/namc/user-secrets 
Add migration rule for 'userSecretsId'
 2016-10-05 16:40:38 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration 
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
 2016-10-05 16:25:28 -07:00
Faizan Ahmad
a8e7df848b Adding support for noBuild, output and framework. 2016-10-06 04:33:54 +05:30
Livar Cunha
bfc1f82d68 Fixing the tools item name in csproj. Nuget used a different one then was originally at the spec. 2016-10-05 15:27:30 -07:00
Nate McMaster
190f0fc756 Rename to MigrateJsonPropertiesRule 2016-10-05 15:15:13 -07:00
Nate McMaster
dd7a76e6f0 Add migration rule for 'userSecretsId' 2016-10-05 15:05:19 -07:00
Fredric Silberberg
b2802cdf50
Added comment about updating in VS calls of dotnet migrate when cli args change. 2016-10-05 14:26:20 -07:00
Bryan Thornbury
50e83b9c65 Merge pull request #4320 from brthor/brthor/toolsrefmigration 
dotnet cli migrate tools ref
 2016-10-05 13:39:34 -07:00
Livar
7a0dff8a96 Merge pull request #4300 from livarcocc/support_for_toolsref 
Support for toolsref
 2016-10-05 13:18:12 -07:00
Livar Cunha
465b32dab4 Addressing code review comments. 2016-10-05 11:51:59 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Livar Cunha
facbef52ff Changing the code to read tools from csproj because the tools section in assets.json is no longer being populated. 2016-10-04 18:59:44 -07:00
Livar Cunha
1570e0fde4 Moving the ProjectToolsCommandResolver to dotnet out of Cli.Utils because of the dependency on Microsoft.Build. Also added a EndToEnd test for tools ref using the MSBuildTestApp. 2016-10-04 18:59:44 -07:00
Livar Cunha
12e8e8eca7 Temp 2016-10-04 18:58:38 -07:00
Livar Cunha
b4b89c7849 Switch to code to generate deps file for tools using the lock file. 2016-10-04 18:58:38 -07:00
Livar Cunha
05472919af Changing the tool resolution to fully use the NuGet file and no longer rely on the project.json file. 2016-10-04 18:58:38 -07:00
Bryan Thornbury
3149af8941 remove proejct.migrated.json 2016-10-04 16:40:20 -07:00
Bryan Thornbury
49637d0fe9 pr feedback 2016-10-04 16:37:23 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
851ed78605 key 2016-10-04 15:53:14 -07:00
Bryan Thornbury
148008d733 fix key sign 2016-10-04 15:49:35 -07:00
Bryan Thornbury
7632cd3502 Merge pull request #4261 from brthor/brthor/packageref 
PackageReference Migration
 2016-10-04 14:42:43 -07:00
Bryan Thornbury
21c45de0b7 error preference 2016-10-04 10:45:57 -07:00
Faizan Ahmad
579df78466 - Implementation of test3 verb for single TragetFramework 
- E2E test for test3 verb.
 2016-10-04 15:37:36 +05:30
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Eric Erhardt
d4d2be5f8c Fix the merge of preview2 to build correctly. 2016-10-03 14:48:33 -05:00
Eric Erhardt
5055935008 Merging rel/1.0.0-preview2 into rel/1.0.0. 2016-10-03 14:47:24 -05:00
Faizan Ahmad
b240b855c1 Update the new version of Microsoft.TestPlatform.cli which has fix related to testAdapterPath. 
Updated the test project to reflect the same.
 2016-10-04 00:17:35 +05:30
Eric Erhardt
f065a29704 Rename IsCurrentRuntimeSupported() to SupportsCurrentRuntime(). 2016-10-03 12:45:39 -05:00
Eric Erhardt
a7366f5864 Add support for publishing self-contained applications. 
Fix #4204
 2016-10-03 09:23:00 -05:00
Livar Cunha
5f3da6428d Testing out a theory that setting the output path will solve this problem. 2016-09-30 15:52:22 -07:00
Livar Cunha
27b5abfc36 Trying out with the latest SDK. 2016-09-30 12:03:03 -07:00
Eric Erhardt
283bf7139e Changing the rules on when to use the CLI's BuildRid. 
Use the CLI's BuildRid when the current machine is not supported by the shared framework.
 2016-09-30 12:00:37 -05:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
77ada164c6 Forgot to actually invoke the method to clean PackageRefs. 2016-09-30 09:27:15 -07:00
Livar Cunha
7e16ad0388 Adding TargetFrameworks even for single TFM and cleaning up PackageRef. 2016-09-30 09:27:15 -07:00
Livar Cunha
715f1f6a10 Addressing code review comments. 2016-09-30 09:27:15 -07:00
Livar Cunha
c04f7a0cd0 Changing the migrate command to obtain the sdk package version from the PackageRef in csproj instead of project.json. 2016-09-30 09:27:15 -07:00
Livar Cunha
c41b35f06f Updating tests to reflect msbuild projects running without project.json. 2016-09-30 09:25:11 -07:00
Livar Cunha
2bbef9328b Removing project.json from msbuild template and msbuild test app. 2016-09-30 09:25:11 -07:00
Eric Erhardt
ce6c29676d Adding "BuildRid" to the CLI as a fallback RID to use when inferring which RID to use when building, running, and publishing self-contained applications. 
This enables users to use the CLI on newer versions of the OS that aren't fully supported yet - for example using a new OSX version that isn't listed in the runtime graph in the current NuGet packages.

Fix #4238
 2016-09-29 22:39:00 -05:00
Livar Cunha
e91b2f6011 Updating ToolpathCalculator to use asset.json now that we updated to a new NuGet. 2016-09-29 14:06:45 -07:00
Livar Cunha
082a90035d Bumping nuget to 3.6.0-beta.1.msbuild.17 2016-09-29 12:16:41 -07:00
Sridhar Periyasamy
98231a6628 Merge pull request #4254 from dotnet/sridhar-ms/migrate-directory 
Add support to migrate a directory.
 2016-09-29 10:13:55 -07:00
Eric Erhardt
04869b9997 Updating msbuild to 0.1.0-preview-00043-160929. 2016-09-29 10:26:55 -05:00
Bryan Thornbury
f5b17e63ce fixup 2016-09-28 15:40:38 -07:00
Bryan Thornbury
8c563a58f8 Fix tools with trailing backslashes in additionalProbingPath 2016-09-28 14:21:52 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Nick Guerrera
936692acf1 Update msbuild to latest 2016-09-28 04:37:39 -07:00
Livar
464024252f Merge pull request #4267 from livarcocc/fix_run_csc_cmd 
Double quoting the path to the host and to csc.dll in RunCsc.cmd
 2016-09-27 17:52:28 -07:00
Livar Cunha
9150596c92 Double quoting the path to the host and to csc.dll in RunCsc.cmd so that it works when the CLI is in a path with spaces. 2016-09-27 16:17:06 -07:00
Eric Erhardt
3da55881b5 Merge pull request #4264 from nguerrera/update-msbuild 
Update msbuild to latest
 2016-09-27 18:08:12 -05:00
Nick Guerrera
6bc099e5e0 Update msbuild to latest 2016-09-27 15:16:13 -07:00
Livar Cunha
d7e00907e0 Fixing windows test breaks. It was because of how the NuGet API is putting Directory Separators in the lock file. They always normalize them to forward slash. 2016-09-27 13:08:45 -07:00
Livar Cunha
2ea227e388 Fixing a build break on windows. 2016-09-27 10:53:23 -07:00
Livar Cunha
2acd4474de Fixing a migration test where migration was not failing for a unresolved dependency because we were not classifing unresolved dependencies correctly. 2016-09-27 10:53:23 -07:00
Livar Cunha
f0a50c92ac Fixing issues small issues found during build and tests. 2016-09-27 10:53:22 -07:00
Livar Cunha
6527cbc592 Replacing the LockFile APIs from the one in ProjectModel to the one in NuGet.ProjectModel. 2016-09-27 10:53:21 -07:00
Rohit Agrawal
cfe76534ca bump nuget to 3.6.0-beta.1.msbuild.16 2016-09-26 16:47:20 -07:00
Sridhar Periyasamy
7ee2bd1f26 Add support to migrate a directory. 
- Given a directory migrate all the project.jsons in it recursively.
- Remove '-p/--project' option. Instead directly pass a directory or project.json as argument.
- Add tests.
 2016-09-26 14:16:17 -07:00
Eric Erhardt
5434c7f392 Merge pull request #4237 from eerhardt/PublishCommand 
Add `dotnet publish3` command
 2016-09-26 11:51:19 -05:00
Sridhar Periyasamy
038fb6fbae Merge pull request #4221 from dotnet/sridhar-ms/multiple-proj-migrate 
Migrate P2P references
 2016-09-23 22:30:58 -07:00
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Rohit Agrawal
dfc5650db8 bump nuget version to 3.6.0-beta.1.msbuild.15 (#4241) 2016-09-23 17:14:32 -07:00
Sridhar Periyasamy
d43ade9629 Address PR Feedback 2016-09-23 15:31:15 -07:00
Eric Erhardt
fce4b9044a Respond to PR feedback. 2016-09-23 16:53:57 -05:00
Bryan Thornbury
b0565e6498 fix projectdependnecy finder 2016-09-23 14:25:57 -07:00
Sridhar Periyasamy
46ab621422 Migrate P2P references 
- Given a project migrate all the project references recursively.
- Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
- Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
- Add tests
 2016-09-23 14:25:57 -07:00
Eric Erhardt
66fbd6f278 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160923-4. 2016-09-23 16:14:03 -05:00
Livar Cunha
f11e555480 Adding framework as an option to the run3 verb. 2016-09-23 11:16:52 -07:00
Livar Cunha
bd2e66fca6 Switching to a new API to detect platform. 2016-09-23 10:40:25 -07:00
Livar Cunha
d1cea1bef2 Addressing code review comments. 2016-09-23 10:16:44 -07:00
Livar Cunha
2ffe5233bd Removed the roslyn-master-nightly feed. Web hook is being set there. For now, pushed the dependencies by hand to cli-deps. Also updated to a new package from Roslyn with a fix to a NRE that was happening on windows. 2016-09-23 10:16:44 -07:00
Livar Cunha
9542d61224 Adding a RunCsc.cmd. 2016-09-23 10:16:44 -07:00
Livar Cunha
4019fdca16 Removing DotnetHostPath and setting CscToolExe to determine which script to use to run csc.exe using dotnet. Need to add the script counterpart for windows still. Doing that next. 2016-09-23 10:16:44 -07:00
Livar Cunha
85d6f3ccce Updating csc to 2.0.0-beta and replace Microsoft.Net.Compilers.Targets.NetCore package with Microsoft.CodeAnalysis.Build.Tasks 2016-09-23 10:16:44 -07:00
Eric Erhardt
eed29be806 Add dotnet publish3 command. 2016-09-23 12:12:55 -05:00
Eric Erhardt
d4f6144355 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160921-4. 2016-09-23 12:12:55 -05:00
Eric Erhardt
5cfe3e9ff5 Merge pull request #4229 from eerhardt/NewCommands 
Create a `dotnet msbuild` command and fill out the applicable command line arguments to `dotnet build3`.
 2016-09-23 09:05:01 -05:00
Bryan Thornbury
a04194c0f7 Merge pull request #4224 from brthor/brthor/remove-nuget 
Migration: Remove dependency on lock file and dotnet restore
 2016-09-22 18:47:58 -07:00
Livar
85819d562b Merge pull request #4232 from jamesqo/patch-1 
Remove whitespace from dotnet-new C# library template
 2016-09-22 17:57:48 -07:00
Livar
a0aa51777f Merge pull request #4233 from livarcocc/migrate_packOptions 
Adding migrate PackOptions capabilities.
 2016-09-22 17:57:08 -07:00
Bryan Thornbury
b4a0cc245a Clean up ProjectDependencyFinder API to be self contained 2016-09-22 17:44:34 -07:00
Eric Erhardt
65218848e8 Respond to PR feedback. 2016-09-22 19:11:08 -05:00
Livar Cunha
768e289f0c Adding migrate PackOptions capabilities. 2016-09-22 16:14:27 -07:00
James Ko
5397cac939 Remove whitespace from dotnet-new C# library template 2016-09-22 17:50:33 -04:00
Bryan Thornbury
fe8f440ed6 cleanup usings and headers 2016-09-22 14:35:31 -07:00
Bryan Thornbury
95e0ed3713 fix errors, enable tests 2016-09-22 14:30:56 -07:00
Nick Guerrera
2c0acebd3d Update S.R.Serialization.Xml ref to 4.1.1 2016-09-22 13:31:36 -07:00
Nick Guerrera
4807c8b0b0 Update msbuild to latest 2016-09-22 12:52:09 -07:00
Bryan Thornbury
3e6e1ddcd0 add support for conditioned csproj references, add tests 2016-09-22 12:51:23 -07:00
Eric Erhardt
d6adea1af0 Create a dotnet msbuild command and fill out the applicable command line arguments to dotnet build3. 
Fix #4203
 2016-09-22 14:47:50 -05:00
Bryan Thornbury
a688885f21 remove nuget dependency in tests 2016-09-21 21:23:50 -07:00
Bryan Thornbury
8a420de736 Remove nuget dependency 2016-09-21 21:14:48 -07:00
Bryan Thornbury
5dd1c3f92c fix todo 2016-09-21 17:29:22 -07:00
Bryan Thornbury
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Rohit Agrawal
bf8b588e8b add includesymbols and includesource to pack3 command as symbols package is not created by default (#4193) 2016-09-21 16:39:59 -07:00
Bryan Thornbury
2dd99ce015 improve finding encompassed items in a configuration 2016-09-21 14:41:16 -07:00
Bryan Thornbury
eaf245fd75 trace on config exit 2016-09-21 11:34:36 -07:00
Bryan Thornbury
c6908595cd fill out trace messages more 2016-09-21 11:33:12 -07:00
Bryan Thornbury
875d91629e case insensitive msbuild metadata findng 2016-09-21 11:31:30 -07:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
3a567e5957 Merge pull request #4185 from brthor/brthor/migrate-x-targetting 
Migration X-Targeting
 2016-09-19 16:01:04 -07:00
Faizan2304
0ce597a147 Implemented vstest verb which will run the test from given container. (#4115) 
* Implemented vstest verb which will run the test from given container.

* Fixed Nitpick.

* 1) Addressed PR comment
2) Added tests for vstest verb

* Using specific version of Microsoft.TestPlatform.

* Address PR comments.

Modified help text for the vstest command.
Removed unused function.

* Fixed package related issue.
--Taking reference of microsoft.testplatform.cli nuget package which has contentFolder in it so that sub folder of this nuget can also be added in cli package.
-- Removing vstest.console, vshost and datacollector from Bundletools as we dont want *.deps.json to be override

* Nitpick

* Making vstest.console arguments compatible for non windows platform

* Fix tests to run on linux machine

* Updated the microsoft.testplatform.cli nuget package version. This version has fix related to non windows machine.

* changed dapter path from bin/debug to bin/Debug

* updated nuget version of package Microsoft.TestPlatform.CLI.

* Revert "updated nuget version of package Microsoft.TestPlatform.CLI."

This reverts commit bcc26c21d11c2bd2e5259a74f9890b0fd75962c7.

* Updated version of nuget package Microsoft.TestPlatform.CLI
Added Test project in solution file

* Addressed PR comment.

* Removed unnecessary --platform argument from test
 2016-09-19 10:59:26 -07:00
Bryan Thornbury
e8df0e712e only emit TargetFrameworks for multitfm 2016-09-19 10:10:36 -07:00
Bryan Thornbury
fe20698d81 PR Feedback 2016-09-16 16:37:48 -07:00
Justin Emgarten
1626cf2e62 Restore3 support for PackageReference 
Fixes https://github.com/NuGet/Home/issues/3453
 2016-09-16 13:40:10 -07:00
Bryan Thornbury
1198b30031 output TFI, TFV for now 2016-09-16 03:26:36 -07:00
Bryan Thornbury
944eb1e787 Migration X-Targeting 2016-09-15 15:54:10 -07:00
Nick Guerrera
e59b2f3e6d Update msbuild 2016-09-15 10:59:03 -07:00
Eric Erhardt
95def6b243 Merge pull request #4178 from kotovaleksandr/rel/1.0.0 
fix #4090
 2016-09-15 10:57:56 -05:00
Eric Erhardt
656f65866c Merge pull request #4174 from eerhardt/NewRunInfo 
Update the CLI to the new Run static properties from the SDK.
 2016-09-15 09:53:04 -05:00
Eric Erhardt
3026eb9d35 Add a better error message for 'dotnet run3' when it is unable to find a RunCommand property. 2016-09-14 16:27:52 -05:00
Bryan Thornbury
fb49229ddf internals visible to 2016-09-14 13:40:41 -07:00
Bryan Thornbury
c30fc56fcc Update project.json 
Strong name sign migration library
 2016-09-14 13:32:38 -07:00
Eric Erhardt
f9953c1e68 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160914-1. 2016-09-14 14:55:17 -05:00
kotov.a
8a93af528b fix #4090 2016-09-14 16:35:37 +03:00
Eric Erhardt
a8c804cba7 Update the CLI to the new Run static properties from the SDK. 
See https://github.com/dotnet/sdk/issues/98
 2016-09-13 20:47:22 -05:00
Rohit Agrawal
194a850c71 update nuget and sdk to include msbuild pack target 2016-09-12 17:10:31 -07:00
Eric Erhardt
18456af5ca Merge pull request #4162 from eerhardt/NewMSBuild 
Update MSBuild to 0.1.0-preview-00034-160909.
 2016-09-12 14:47:03 -05:00
Eric Erhardt
5035746370 Merge pull request #4152 from livarcocc/bring_back_project_model_server 
Adding dotnet-projectmodel-server back
 2016-09-12 14:39:38 -05:00
Eric Erhardt
0ecb3b7538 Update MSBuild to 0.1.0-preview-00034-160909. 2016-09-12 12:14:17 -05:00
Eric Erhardt
f084032af6 Ensure the project is built in dotnet run3. 2016-09-09 08:53:57 -05:00
Livar Cunha
72a053fa0e Adding the projectmodel-server command back to the list of built-in commands. 2016-09-07 18:32:34 -07:00
Livar Cunha
55c57608f8 Adding dotnet-projectmodel-server back because ASP.NET needs it to unblock themselves from start migrating to msbuild. We need to remove this as soon as ASP.NET can migrate all their projects to csproj and the tooling is in place. 2016-09-07 14:14:41 -07:00
Eric Erhardt
ab8e1b707b Merge pull request #4143 from eerhardt/NewSDK 
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1
 2016-09-07 15:44:23 -05:00
Eric Erhardt
8000c98103 Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160907-1 2016-09-07 14:49:18 -05:00
Livar
8d7dd3992f Merge pull request #4145 from livarcocc/merge_preview2_to_rel100 
Merge preview2 to rel100
 2016-09-06 21:13:41 -07:00
Livar
a2b861e4c8 Merge pull request #4137 from tmat/EmbeddedPdbSupportRel 
Implement support for Embedded PDB
 2016-09-02 17:15:50 -07:00
Livar Cunha
1767385aa1 Updating versions in a few places that did not exist in the preview2 branch. 2016-09-02 15:01:59 -07:00
Livar Cunha
27bc1c4f91 Merge branch 'rel/1.0.0-preview2' into merge_preview2_to_rel100 
* rel/1.0.0-preview2:
  Update versions of EF and scaffolding tools
  Update Kestrel to 1.0.1
  Update version of routing to 1.0.1
  Add missing comma to F# lib project.json
  Update cshtml wildcard in publishOptions
  Don't print arguments in F# console app
  Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
  Update MVC version to 1.0.1
  Upgrade Corefx and coreclr references
  fix typo in dotnet-install file
  Remove the VS2012 CRT dependency from docs (#3632)
  Fix README to use hostfxr download links (#3622)
  Fix Oracle Linux version in README.md
  Use NugetCache Sentinel for Telemetry setting.
  Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
  Remove showing firsttime eula for non verbs.
  Adding Oracle Linux and Linux Mint to the titles
  Moving Ubuntu 16.04 to be next to Ubuntu 14.04
  Update README.md
 2016-09-02 14:53:16 -07:00
Joel Verhagen
3619b7d767 Set the "hashPath" when building the .deps.json file 
Update Microsoft.Extensions.DependencyModel to 1.0.1-beta-000933
Update Microsoft.DotNet.PlatformAbstraction to 1.0.1-beta-000933
Update NuGet to 3.6.0-beta.1.msbuild.4
Update dotnet-test-xunit to 1.0.0-rc2-350904-49
 2016-09-02 10:02:54 -07:00
Eric Erhardt
bb130ce71f Merge pull request #4134 from eerhardt/NewSDK 
Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1
 2016-09-01 16:13:38 -05:00
Tomas Matousek
b5cfb9d660 Implement support for Embedded PDB 2016-09-01 14:02:03 -07:00
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Bryan Thornbury
7b5ca2da34 Add Scripts environment variable support 2016-08-31 15:30:23 -07:00
Ryan Nowak
5e173f38e9 Update versions of EF and scaffolding tools 2016-08-31 14:42:29 -07:00
Ryan Nowak
6bd5bfc3e5 Update Kestrel to 1.0.1 2016-08-31 13:53:02 -07:00
Ryan Nowak
6a1b41fac6 Update version of routing to 1.0.1 
This is needed because MVC still references 1.0.0.
 2016-08-31 13:42:05 -07:00
cartermp
07b581f091 Add missing comma to F# lib project.json 2016-08-31 12:13:31 -07:00
Ryan Nowak
9646db0cc8 Update cshtml wildcard in publishOptions 
Updating the publishOptions wildcard that used to publish everything in
the views folder to now publish all .cshtml files. The problem was that
the old wildcard only included the Views folder and didn't include
anything in the Areas/*/Views folders (used by views inside areas).

This change makes things much simpler, all .csthml files are published.
 2016-08-31 11:31:10 -07:00
cartermp
5d8aedebf3 Don't print arguments in F# console app 2016-08-31 11:27:18 -07:00
cartermp
0c10baa40d Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase) 
This updates the F# templates for dotnet-new to be compatible with Preview 2.
 2016-08-31 11:26:41 -07:00
Ryan Nowak
01caa0fb4f Update MVC version to 1.0.1 
We're shipping a new patch of all MVC packages in 1.0.1. This bumps up the
version number of the MVC metapackage so that projects created with
`dotnet new` get the latest version.
 2016-08-31 11:22:43 -07:00
Sridhar Periyasamy
8fcfc2af05 Upgrade Corefx and coreclr references 
Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
 2016-08-31 10:41:47 -07:00
Livar Cunha
0c60dc7c2e Fixing the version back to preview3 and the channel to rel-1.0.0 2016-08-30 21:32:45 -07:00
PiotrP
a6ee3df5b2 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 14:10:47 -07:00
Piotr Puszkiewicz
74a9a533bd Merge pull request #4121 from dotnet/piotrpMSFT/revmsbuild 
Update msbuild version to latest
 2016-08-30 14:03:18 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
b900f0b327 Solution and project cleanup 2016-08-30 12:00:08 -07:00
Bryan Thornbury
d8556d1ed7 Include context fixes to include the default files even when buildoptions is empty, so we have less custom logic in the migration library 2016-08-30 11:56:56 -07:00
Bryan Thornbury
611e4ccfde dotnet-migrate built in command for cli 2016-08-30 11:56:53 -07:00
Bryan Thornbury
46818ff3fa Microsoft.DotNet.ProjectJsonMigration core library 2016-08-30 11:56:03 -07:00
PiotrP
c74370b636 Update MSBuild version 2016-08-30 11:18:40 -07:00
PiotrP
ec23abadec Update MSBuild version 2016-08-30 10:31:04 -07:00
PiotrP
3cdd15a145 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-30 10:30:45 -07:00
Livar
be8428cb6c Merge pull request #4102 from livarcocc/test_without_pj 
Adding the capability to run tests against a published dll
 2016-08-29 21:58:13 -07:00
Piotr Puszkiewicz
eff2beeb7d Clean up dead code 2016-08-29 10:27:53 -07:00
Livar Cunha
7d60d66a86 Addressing more code review comments. 2016-08-29 09:46:12 -07:00
Piotr Puszkiewicz
8eecff0112 Address build issues 2016-08-27 15:57:14 -07:00
Piotr Puszkiewicz
ab1797cb29 Merged branch feature/msbuild into piotrpMSFT/branchmerge 2016-08-26 22:39:40 -07:00
Piotr Puszkiewicz
1ce482a8d1 Merge remote-tracking branch 'refs/remotes/origin/rel/1.0.0' 
Conflicts:
	scripts/obtain/dotnet-install.ps1
	src/dotnet/commands/dotnet-new/CSharp_xunittest/project.json.template
 2016-08-26 22:39:14 -07:00
PiotrP
ae4a690724 Fix tests 
Missing namespace
Re-enable dotnet-nuget unit tests
 2016-08-26 18:14:04 -07:00
PiotrP
336ecc0e89 Merge Nuget changes 
Fix pack
Move dotnet-nuget to NuGetForwardingApp [tests will need to be fixed]
 2016-08-26 17:23:33 -07:00
Livar Cunha
9f2a0169fc Addressing code review comments. 2016-08-26 11:23:47 -07:00
Livar Cunha
b09a6c6350 Adding dotnet-test-console to the list of generated nupkgs and fixing some namespace for the new command resolvers. 2016-08-25 23:14:25 -07:00
Livar Cunha
e8f2dabcdb Fixing broken tests after my changes to the CommandResolvers. 2016-08-25 22:53:04 -07:00
Livar Cunha
55c00a7e45 Adding a resolution chain to the command resolution chain that works based on a directory, more specifically, the publish directory. 2016-08-25 16:01:32 -07:00
Simon de Lang
8f92f0d74b Update xunit dependencies for CSharp_xunittest template 2016-08-25 15:02:52 +02:00
Livar Cunha
7e556e37d2 Adding a separate runner for project.json and for assembly. 2016-08-24 15:24:30 -07:00
Nick Guerrera
2accc15543 Add missing msbuild dependency 
This is a workaround until the msbuild .nupkg manifests
the dependency correctly
 2016-08-24 10:29:53 -07:00
Nick Guerrera
c702957730 Update to new msbuild 2016-08-24 10:10:20 -07:00
Eric Erhardt
a543050c62 Update the Sdk version to the latest build. 2016-08-23 13:44:07 -05:00
Livar Cunha
dddfb6bb45 Adding new unit tests to cover TestRunner in DotnetTestParams. 2016-08-23 11:26:37 -07:00
Livar Cunha
0667e84069 Added an ITestRunnerResolverFactory that decides on which resolver to use based on the set of parameters received. 2016-08-22 21:29:14 -07:00
Livar Cunha
8e432e567a Adding TestRunner resolvers that will be able to find a test runner based on different criteria. 
Moving dotnet test command to its own library that can be shared between dotnet test and the test target in the SDK folder.
 2016-08-22 15:45:13 -07:00
Adam Baxter
feb6a1484d Rename Microsoft.DotNet.Compiler.Common.xproj to match the casing in the .sln 
Allows nuget restore to run (but fail) on case sensitive filesystems/platforms
 2016-08-22 22:30:48 +10:00
Piotr Puszkiewicz
578adf072c Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild' 
Conflicts:
	src/dotnet/Program.cs
 2016-08-18 18:08:45 -07:00
Piotr Puszkiewicz
c5cc9feb6d Update xunit template 2016-08-18 17:10:20 -07:00
Piotr Puszkiewicz
e92c9603c8 Test reliability and format cleanups 2016-08-18 17:10:20 -07:00
Rohit Agrawal
e08da40a1f added pack3 command for dotnet (#4058) 2016-08-18 16:53:55 -07:00
Joel Verhagen
aacc30d5d8 Add "path" property the .deps.json file for libraries 
Update DependencyModel and PlatformAbstractions packages to 1.0.1-beta-000917
Update dotnet-test-xunit to 1.0.0-rc2-330423-54
 2016-08-18 15:57:03 -07:00
Livar Cunha
86f8115ee7 Updating the System.Reflection.Metadata version and changing the order of platform assemblies passed to crossgen. 2016-08-17 16:42:19 -07:00
Piotr Puszkiewicz
2db1997bc0 Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild' 
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/DebTargets.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	scripts/package/package-debian.sh
	src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs
	src/dotnet/commands/dotnet-new/Program.cs
	src/dotnet/commands/dotnet-pack/PackageGenerator.cs
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
 2016-08-16 18:30:52 -07:00
drewgil
11b666acee Add nuget command to dotnet cli 2016-08-16 09:27:55 -07:00
Justin Emgarten
51ea2e6014 Adding Restore3 command for msbuild restore support. 2016-08-12 00:05:21 -07:00
Eric Erhardt
6cf2167992 Update the CLI to use the new Core SDK nuget package. 
No need for build3 to set Platform properties and BaseNuGetRuntimeIdentifier.  The SDK handles that.

Also, no need to set "runtimes" any more in the default project.json.
 2016-08-11 12:05:28 -05:00
Eric Erhardt
f48effff61 Add System.Resources.Writer to src\dotnet\project.json 2016-08-10 20:08:54 -05:00
Eric Erhardt
94223a7009 Tell dotnet restore to install nuget.props and nuget.targets files using an environment variable, so the SDK .targets are installed into the user's project. 2016-08-10 20:08:17 -05:00
Eric Erhardt
736652fe71 Remove the SDK artifacts from the CLI. 
These are now contained in github.com/dotnet/sdk.
 2016-08-10 20:08:17 -05:00
Livar Cunha
8bb7e01f0f Fixing a version conflict in Testing.Abstractions and bumping InternalsAbstractions version to 2.0.0, since I removed some public APIs from it. 2016-08-10 13:40:27 -07:00
Livar Cunha
dc7f1fdf84 Updating the xunit version to one that does not depend on internalabstractions. 2016-08-10 13:40:13 -07:00
Livar Cunha
b7b90175f4 Removing the public types from InternalAbstractions. 2016-08-10 13:39:49 -07:00
Livar Cunha
0a55a7cb99 Updating the msbuild changes to handle DependencyModel coming from core-setup instead of a project dependency. 2016-08-10 13:39:49 -07:00
Livar Cunha
e900e23544 Updating dependencies to use the new dependencymodel and platformabstractions. Also updated the xunit template to add internalabstractions. 
Conflicts:
	src/Microsoft.DotNet.Cli.Utils/project.json
	test/dotnet-build.Tests/BuildOutputTests.cs
 2016-08-10 13:39:49 -07:00
Livar Cunha
ee1474c161 Removing dependency model from CLI repo. 
Conflicts:
	Microsoft.DotNet.Cli.sln
	build_projects/dotnet-cli-build/PackageTargets.cs
	build_projects/dotnet-cli-build/TestPackageProjects.cs
	build_projects/dotnet-cli-build/TestTargets.cs
	src/Microsoft.Extensions.DependencyModel/CompilationLibrary.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContext.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextLoader.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextPaths.cs
	src/Microsoft.Extensions.DependencyModel/DependencyContextWriter.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/PackageCacheCompilationAssemblyResolver.cs
	src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs
	src/Microsoft.Extensions.DependencyModel/project.json
	test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonWriterTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/FunctionalTests.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageCacheResolverTest.cs
	test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs
 2016-08-10 13:39:49 -07:00
Piotr Puszkiewicz
b3f5174f00 PR Feedback 2016-08-09 14:49:13 -07:00
Piotr Puszkiewicz
3a55a4182f src/redist/project.json 2016-08-09 13:22:22 -07:00
Eric Erhardt
2bea6bac83 Move 14.1 to 15.0 now that MSBuild is version 15.0. 2016-08-09 10:28:50 -05:00
Zlatko Knezevic
3abada74d4 Update HelpCommand.cs 
Changing the text from "Common Commands" to just "Commands" to indicate that these are in the box, so to speak.
 2016-08-07 07:31:28 -07:00
Piotr Puszkiewicz
79648f9ccb Update stage0 msbuild 2016-08-07 01:51:47 -07:00
Tomáš Matoušek
8f00e03c43 Merge pull request #3989 from tmat/AnyDebugType 
Pass debugType thru to the command line compiler
 2016-08-04 13:14:42 -07:00
Tomas Matousek
dfbea3df34 Pass debugType thru to the command line compiler 2016-08-03 18:08:14 -07:00
jplebre
408d083525 eeeek! (sorry, wrong dependency version edited) 2016-08-03 22:06:17 +01:00
jplebre
4508884c42 clean up and added nunit command to README 2016-08-03 22:06:17 +01:00
jplebre
09d37fe3ec removed the -* from version numbers in xunit and nunit templates 2016-08-03 22:06:17 +01:00
jplebre
82bf84f46b projec.json should be the same as nunit's template 2016-08-03 22:06:17 +01:00
jplebre
b889e97a88 fixed trailing commas 2016-08-03 22:06:17 +01:00
jplebre
069a351971 adding nunit test to the list of commands 2016-08-03 22:06:17 +01:00
Bryan Thornbury
308f49c32e Merge pull request #3983 from brthor/brthor/runtimeoptions 
Add support for user runtimeconfig
 2016-08-03 10:51:33 -07:00
Bryan Thornbury
931e8fdf96 Add support for user runtimeconfig 2016-08-02 16:18:19 -07:00
Livar
32d273580f Merge pull request #3981 from livarcocc/dependency_model_change_from_rel100 
Merge the JsonTextReader change from rel/1.0.0 to feature/msbuild
 2016-08-02 14:23:43 -07:00
Pavel Krymets
ee6063b12b Use JsonTextReader in DependencyContextJsonReader (#3972) 
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
 2016-08-02 13:16:44 -07:00
Eric Erhardt
ddb6a877af Add netstandard1.3 TFM to DependencyModel so the MSBuild task can target netstandard1.3 and still use it to write the .deps.json file. 2016-08-02 14:53:19 -05:00
Pavel Krymets
b7075b857b Use JsonTextReader in DependencyContextJsonReader (#3972) 
Using low level JsonTextReader in DependencyContextJsonReader class for performance reasons
 2016-08-02 10:02:30 -07:00
Eric Erhardt
df3fea3736 Merge pull request #3962 from eerhardt/msbuild-GenerateDepsFile 
Implement GenerateDepsFile MSBuild Task
 2016-08-01 20:17:05 -05:00
Eric Erhardt
b5d312e7fa PR feedback. 2016-08-01 19:06:46 -05:00
Eric Erhardt
10cfa744e5 PR feedback. 
Implement VersionPrefix and VersionSuffix MSBuild properties.

Use FluentAssertions in the test.
 2016-08-01 15:02:22 -05:00
Eric Erhardt
b3e69b139e Update NuGet to 3.5.0-rc1-1697 2016-08-01 13:58:04 -05:00
Eric Erhardt
a4aa0a99cd Implement GenerateDepsFile MSBuild Task 2016-07-29 20:46:34 -05:00
Livar Cunha
b05b0e6dc5 After NuGet started lower casing the packages, we started hitting issues where we failed to locate dependencies under our list of libraries due to different casing in the libraries names. The fix here is to compare the library names ignoring casing. 2016-07-28 21:17:32 -07:00
Eric Erhardt
eca827e0d4 Merge pull request #3922 from blackdwarf/templatesfix 
Remove namespace and public from console app
 2016-07-27 07:53:23 -05:00
Eric Erhardt
104ca5219d Ensure additional probing paths don't have a trailing slash. 
Workaround for https://github.com/dotnet/core-setup/issues/228.
 2016-07-26 22:27:25 -05:00
Eric Erhardt
ba0f71f5a5 Use object serialization to write the runtime config files. 2016-07-26 21:56:47 -05:00
Eric Erhardt
efc0efe4f9 Workaround native deps resolver not lower casing the file paths into the NuGet cache. 
This is needed until https://github.com/dotnet/core-setup/pull/64 is merged.
 2016-07-26 21:00:14 -05:00
Eric Erhardt
a48def9ade Fix package code for new NuGet. 
The new NuGet uses tolower paths, and we need to react to it.

Port https://github.com/dotnet/cli/pull/2722
Port https://github.com/dotnet/cli/pull/3554
 2016-07-26 20:53:20 -05:00
Eric Erhardt
2ac8ca0e07 Update Microsoft.NuGet.Build.Tasks to 1.0.0-alpha-000002, which has the casing fix for Microsoft.Net.Compilers.netcore dependency. 2016-07-26 20:53:19 -05:00
Eric Erhardt
369a6894dd Fix the casing of Microsoft.Net.Compilers.netcore since the latest NuGet cares about this now. 2016-07-26 20:53:18 -05:00
Eric Erhardt
6eabeb9be0 Generate runtimeconfig.json and runtimeconfig.dev.json from MSBuild 
Moves generating the runtimeconfig files to a separate MSBuild target which is only dependent on project.lock.json.

Also, moving up our NuGet dependency to 3.5.0-rc1-1653, since that brings in the LockFile.PackageFolders property, which is needed for runtimeconfig.dev.json.
 2016-07-26 20:53:17 -05:00
Piotr Puszkiewicz
dd43ccb688 Piotrp msft/merge2msbuild (#3941) 
* Add Test for removing readonly flag when copying readonly library assets

* change namespace

* PR Feedback

* Fix newlines in the first run experience message

The newlines in the first run experience were missing which made the text
look a little squashed.

Fixes #3909

* Update README.md (#3904)

* Update README.md

* Responding to PR feedback

* Responding to PR feedback
 2016-07-26 19:22:12 -04:00
Bryan Thornbury
7c71af8db5 get Eric's change 2016-07-25 14:06:46 -07:00
Bryan Thornbury
5d96412b14 change feature-msbuild branch versions 2016-07-25 14:05:41 -07:00
Zlatko Knezevic
6766017ffb Responding to PR feedback 2016-07-22 12:11:01 -07:00
Zlatko Knezevic
252be27100 Remove namespace and public from console app 
Fixes #745, #3531
 2016-07-22 11:56:05 -07:00
Eric Erhardt
c317c92691 Correcting the casing of Microsoft.Common.targets directory 2016-07-22 07:04:24 -05:00
Eric Erhardt
3a446ec5d4 Fixing the Sdk.props to work correctly for Release config and xplat pdb creation. 2016-07-22 07:04:24 -05:00
Eric Erhardt
5296b28db7 Removing all PlatformTarget setting in the default Sdk.props file. 
This value is passed in by the CLI.
 2016-07-22 07:04:23 -05:00
Zlatko Knezevic
d14fda084b Fix newlines in the first run experience message 
The newlines in the first run experience were missing which made the text
look a little squashed.

Fixes #3909
 2016-07-21 23:00:26 -07:00
Eric Erhardt
69619c0716 PR feedback. 2016-07-21 18:17:20 -05:00
Eric Erhardt
f0afc7eb79 Minor cleanup. 2016-07-21 12:41:20 -05:00
Eric Erhardt
9751b3203c Remove the Sdk nuget package. 2016-07-21 12:18:00 -05:00
Eric Erhardt
b068687413 Implement 'run3' command which will execute the MSBuild project. 
Also create a 'dotnet new -t msbuild' template.
 2016-07-21 11:57:20 -05:00
Eric Erhardt
bccff16c18 Round 2: rename the SDK NuGet package and add ImportBeforeAfter files to load them. 2016-07-21 11:57:19 -05:00
Eric Erhardt
30712966cc Prototype round #1 of .NET Core MSBuild .props and .targets. 2016-07-21 11:57:18 -05:00
Eric Erhardt
d2db776d87 Merge rel/1.0.0 into feature/msbuild. 2016-07-18 14:44:06 -05:00
Eric Erhardt
164244f4df Merge pull request #3760 from svick/broken-links 
Fixed docs links in READMEs
 2016-07-14 15:20:17 -05:00
Ajay Bhargav Baaskaran
01021a0a6d Addressed feedback 2016-07-13 15:52:23 -07:00
Ajay Bhargav Baaskaran
dbf7435c3c [Fixes #3502] Fix: publishOptions: [...] not respected 2016-07-13 15:09:22 -07:00
Ajay Bhargav Baaskaran
c748c81a4a [Fixes #3856] Allow mapping of the same file to multiple target paths 2016-07-13 14:56:22 -07:00
Eric Erhardt
703da0da3e Microsoft.NuGet.ImportBefore and ImportAfter 
Add Microsoft.NuGet.ImportBefore and ImportAfter files so .nuget.props and .nuget.targets files get picked up invoking 'dotnet build3'.

I also fixed some .xproj and .sln file issues to get our code to work in VS.
 2016-07-12 18:44:16 -05:00
cartermp
e1be430f59 Add missing comma to F# lib project.json 2016-07-12 15:33:18 -07:00
Eric Erhardt
fc73287c53 Merge pull request #3789 from cartermp/fs-update 
Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
 2016-07-12 13:45:43 -05:00
Piotr Puszkiewicz
08e9bc903e CLI Testing via msbuild (#3779) 
* Rebase

* Remove Multi-Project Validator

* Remove projectmodelserver tests

* Enable test package creation

* Incremental test restore

* WiP

* Enable Test Asset Project restore

* Build Test Assets & Restore Test Projects

* Build Test projects

* Enable Test Execution

also moves Test Targets to a well-known CLI Version [Stage 2]

* Pass throuh existing telemetry profile

* 2-space tabs

* Revert TestTargets.cs

* WiP PR feedback

* Refactoring

* Fix naming of RestoreTestAssetPackages

* DotNetTest task

* Fix merge issue

* ExecuteWithCapturedOutput

MSBuild considers StdErr output to be failures. This causes output of any test command which is expected to produce an error to be swallowed in the test.

* Workaround for always-on tracing functionality in dotnet-test

* Fix Path Separator Windows/Unix

* Seperate package build from pack

* Windows Pathing issues

* PR Feedback

* Workaround for msbuild #773

https://github.com/Microsoft/msbuild/issues/773
 2016-07-11 12:46:27 -07:00
Livar
ec7fc0fc2d Merge pull request #3822 from csMACnz/patch-1 
Fix typo in `Avaiable` for `dotnet new --type` error output
 2016-07-11 10:13:52 -07:00
Eric Erhardt
fa59167974 Merge pull request #3794 from freefair/rel/1.0.0 
Fixed bug in build process with ReadOnly file flag
 2016-07-11 09:25:21 -05:00
Mark Clearwater
6df15c341a Fix typo in Avaiable 
* Should be Available
 2016-07-09 19:10:54 +01:00
Livar Cunha
17ef19e788 Removing ForwardStdOut and ForwardStdErr from the ConsoleTestRunner and from dotnet verbs that are not built-in. BuiltIn verbs were already not using it. 2016-07-07 14:51:35 -07:00
cartermp
fd1da95522 Don't print arguments in F# console app 2016-07-07 14:00:42 -07:00
Dennis Fricke
38f75fd5c5 Update LibraryExporterExtensions.cs 
- removed space
| moved method below StructuredCopyTo
 2016-07-07 15:16:10 +02:00
Dennis Fricke
2084a099b8 Update LibraryExporterExtensions.cs 
tabs -> spaces
 2016-07-06 16:55:35 +02:00
Dennis Fricke
f769f9ea1c Update LibraryExporterExtensions.cs 2016-07-06 16:12:13 +02:00
cartermp
51e7ab465b Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase) 
This updates the F# templates for dotnet-new to be compatible with Preview 2.
 2016-07-05 21:38:12 -07:00
Petr Onderka
c6e42cfe7e fixed docs links in READMEs 2016-07-01 19:33:36 +02:00
PiotrP
5ed1371cd9 Remove Project Model Server 2016-06-30 14:31:08 -07:00
kloun
1706eb19f9 del duplicate newline 2016-06-29 23:54:31 +03:00
Piotr Puszkiewicz
d6849c2fa1 Piotrp msft/3628 rebase (#3694) 
* fix typo

* doc
 2016-06-28 16:29:36 -07:00
Petr Onderka
f811069898 Fixed OutputPath in Configurer xproj (#3685) 
This is required for building in VS.
 2016-06-24 11:10:58 -07:00
Eric Erhardt
cec5bacaad Merge branch 'feature/msbuild' of https://github.com/dotnet/cli.git 2016-06-23 17:52:51 -05:00
Bryan Thornbury
400e1db3b9 dotnet-build3 Adding msbuild execution command to cli 2016-06-23 13:57:33 -07:00
Petr Onderka
63846c5751 Added valid --type values to dotnet help new (#3644) 
Used approach that ensures valid values for --lang and --type
in dotnet help new are always up to date.
 2016-06-22 15:20:40 -07:00
Petr Onderka
90b7617dc5 Fixed links in dotnet READMEs (#3642) 
Also renamed dotnet-test README for consistency.
 2016-06-22 15:19:10 -07:00
Piotr Puszkiewicz
9d01e3bc2e Merge rel/1.0.0-preview2 to rel/1.0.0 (#3677) 
* Update README.md

* Moving Ubuntu 16.04 to be next to Ubuntu 14.04

* Adding Oracle Linux and Linux Mint to the titles

Adding Oracle Linux and Linux Mint to the titles next to their compatible binaries.

* Remove showing firsttime eula for non verbs.

* Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.

Fix #3345

* Use NugetCache Sentinel for Telemetry setting.

* Fix Oracle Linux version in README.md

Oracle Linux 7 -> Oracle Linux 7.1

* Fix README to use hostfxr download links (#3622)

Also fix a rebase error from b524fd079e6dcdd744faeb6061ccbfe99d1f810f#diff-04c6e90faac2675aa89e2176d2eec7d8

* Remove the VS2012 CRT dependency from docs (#3632)

* fix typo in dotnet-install file

This was needed to rebuild the CLI with the updated Roslyn NuGet packages.

Thanks goes to @akoken for the fix.
 2016-06-22 15:17:54 -07:00
Eric Erhardt
04f40f906d Merge pull request #3472 from svick/master-branch-links 
Fixed broken links pointing to master branch
 2016-06-17 14:35:30 -05:00
Troy Dai
c321323dff Merge pull request #3308 from dotnet/troy-2995 
Fix dependencies type changes scenario in project model server.
 2016-06-16 10:32:59 -07:00
Petr Onderka
90d32ab3de Fixed broken links pointing to master branch 2016-06-16 18:37:26 +02:00
Eric StJohn
56ca4285f9 Merge pull request #3604 from ericstj/archiveNoCopy-1.0 
Archiver should not keep files Open
 2016-06-16 09:00:43 -07:00
Troy Dai
b3f67b5bef Update parameter names 2016-06-15 23:25:06 -07:00
Troy Dai
97da0b0696 Fix dependencies type changes scenario in project model server. 2016-06-15 23:24:03 -07:00
Josh Free
ef9ad4044a Merge pull request #3579 from Priya91/rel/1.0.0-preview2 
Remove showing firsttime eula for non verbs.
 2016-06-15 17:02:34 -07:00
Eric St. John
0363308fd1 Archiver should not keep files Open 
Previously I attempted to save the cost of reading/decompressing files
by keeping a copy in memory.  That resulted in too much memory pressure
so I later swapped in temporary files.  This defeated the initial goal
of keeping the streams  alive to some extent since the files would
be flushed to disk.

In practice since all the nupkgs we are packing also have raw files so
we weren't even saving much CPU by avoiding a second decompression.

Switch the archiver to just first index all files and save the source
information to read at a later point.  After this when building the
archive we'll reopen the files/zips and copy from there.

My measurements show that this actually improve the archiving perf and
the lack of temp files means we don't hit the ulimit restriction on OSX.
 2016-06-15 16:12:10 -07:00
Troy Dai
8c67ac9272 Add comments for refresh dependency trigger 2016-06-15 16:07:47 -07:00
Troy Dai
64c49d972a Add test to ensure refresh dependencies' consistency 2016-06-15 16:07:47 -07:00
Troy Dai
4c475002ec Enable project model server to clear cache forcefully 2016-06-15 16:07:47 -07:00
Lakshmi Priya Sekar
db7f68716b Use NugetCache Sentinel for Telemetry setting. 2016-06-15 15:55:28 -07:00
Bryan Thornbury
f0380cfd9c replicate https://github.com/dotnet/cli/pull/3492 2016-06-15 12:29:09 -07:00
Eric Erhardt
15a5c34149 Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies. 
Fix #3345
 2016-06-15 14:14:25 -05:00
Bryan Thornbury
d717b84ec8 merge rel/1.0.0-preview2 into rel/1.0.0 2016-06-15 10:20:50 -07:00
Pavel Krymets
7ec2a0e767 Merge pull request #3574 from dotnet/pakrym/t 
Trim platfrom libraries from deps file
 2016-06-15 10:03:17 -07:00
Pavel Krymets
6b54ae0bcc Trim platfrom libraries from deps fiels 2016-06-15 09:09:38 -07:00
Lakshmi Priya Sekar
eab2494ed5 Remove showing firsttime eula for non verbs. 2016-06-14 17:55:10 -07:00
Eric StJohn
0589496b98 Merge pull request #3562 from ericstj/lzmaNoticesCopyright 
Add LZMA to THIRD-PARTY-NOTICES + (c) header
 2016-06-14 16:21:01 -07:00
Bryan Thornbury
e72d82c2cb Merge pull request #3567 from brthor/brthor/stable 
mark InternalAbstractions and DependencyModel Stable
 2016-06-14 16:00:31 -07:00
Eric Erhardt
b2dadfa81c Merge pull request #3566 from dotnet/DiaSymReader 
Update Microsoft.DiaSymReader reference to 1.0.8
 2016-06-14 17:29:33 -05:00
Eric Erhardt
0cd5afb87c Updating DiaSymReader to 1.0.8 2016-06-14 15:48:35 -05:00
Lakshmi Priya
8dd2479965 Check if project.json exists before creating new project in the same dir (#3543) 
* Check if project.json exists before creating new project in the same dir.

* Change error message.
 2016-06-14 13:20:29 -07:00
Bryan Thornbury
b37ddf7350 mark InternalAbstractions and DependencyModel Stable 2016-06-14 12:51:04 -07:00
Eric St. John
871d25a8a5 Add LZMA to THIRD-PARTY-NOTICES + (c) header 
This adds LZMA to the THIRD-PARTY-NOTICES list for CLI.  Since we've
modified the SDK in porting it to .NET Core and minor bugfixes we've
also been advised to add the .NET Foundation copyright header.
 2016-06-14 10:29:23 -07:00
Eric Erhardt
b93388cde2 Merge pull request #3555 from dotnet/FinalSharedFX 
Final shared framework versions
 2016-06-14 11:39:11 -05:00
Zlatko Knezevic
4da4f95e21 Update documentation (#3549) 
* Updating README.md files as well as man pages

This aligns with the latest changes in the official documentation. It also aligns dotnet test readme.md to official docs and introduces a new doc in the "Documentation" directory that deals with dotnet test protocols.
 2016-06-14 06:42:21 -07:00
Bryan Thornbury
9e97d0400c dotnet-compile-fsc bump to latest 2016-06-14 03:31:22 -07:00
jacalvar
635c3331df Update to Json.NET 9.0.1 2016-06-14 03:21:56 -05:00
Eric Erhardt
a4cef6d367 Updating NuGet to beta2-1484 2016-06-14 03:19:04 -05:00
Eric Erhardt
f25f047376 Updating CoreFX, CoreCLR, Roslyn, CoreSetup to stable versions. 2016-06-14 03:14:53 -05:00
Eric St. John
5790182727 Remove File.Copy optimization during expansion 
Previously we'd keep track of any file that we extracted once and try
to reuse that file (by copying it) if we needed the same file later at a
different destination.  The reason was that it's theoretically faster to
a file copy than a createfile and write, since the copy can happen
entirely in the kernel.  In practice we were foiled by AV scanners.

This happens to be the only time during extraction where we let a file
close after writing it and then try and use it again.  Sure enough on
fast machines we were seeing that as soon as we closed it MsMpEng would
map the file for exclusive access causing our copy to fail with a
sharing violation.

To fix this, I've removed the copy optimization and will just copy the
file from the in-memory archive every time.
 2016-06-13 14:06:05 -07:00
Livar
9f2bb66198 Merge pull request #3485 from livarcocc/offline 
Offline feature work
 2016-06-12 00:58:26 -07:00
Eric Erhardt
c1c7ca06c2 Update NuGet to 3.5.0-beta2-1480 2016-06-11 12:23:24 -05:00
Eric Erhardt
8e83ccb659 Merge pull request #3518 from eerhardt/UpdateDependencies20160611042958 
Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively
 2016-06-11 11:33:21 -05:00
Zlatko Knezevic
79bbfafc51 Fix the project.json for C# library and add tests (#3507) 
* Fix the project.json for C# library and add tests

This commit fixes the bug introduced in project.json for the C# Library
template. It also adds two simple tests for the library template that
drop the class library and then restore and another that also builds.

Fixes #3496
 2016-06-11 06:43:56 -07:00
Eric Erhardt
99c32422b8 Update Microsoft.DiaSymReader to 1.0.8-rc2-60610-01 2016-06-10 23:33:34 -05:00
eerhardt
2aa3dd0843 Updating CoreFx, CoreClr, Roslyn, CoreSetup to rc3-24210-10, rc3-24210-10, beta1-20160610-04, rc3-3004459-00 respectively 2016-06-11 04:29:58 +00:00
Livar Cunha
d8c590e4ce When creating the handle to the in progress sentinel, it was failing because the nuget cache folder did not exist yet. Which translated to us understanding that a first time experience was already running. Now, before creating the handle, we check if the nuget folder exists, if it doesn't, we create it, instead of waiting for nuget to do that during restore. 2016-06-10 18:17:32 -07:00
Andrew Stanton-Nurse
762a259e9f fix #3469 by correcting overflow and enabling tests (#3471) 
* fix #3469 by correcting overflow and enabling tests

* pr feedback
 2016-06-10 17:28:23 -07:00
Eric St. John
2b427bf7db Add copyright headers and cleanup 
Added copyright headers to all the 'dotnet' code and cleaned up to match
repo style guidelines.
 2016-06-10 17:07:25 -07:00
Livar Cunha
105e5ab051 Introducing a in progress sentinel that gets verified before running the first time experience. If we can get a handle for this sentinel, we proceed with the first time run, otherwise, it means there is a first time experience running already, in which case we continue running dotnet normally, even though the final (real) sentinel is not present yet. This prevents multiple dotnet commands from running the first time experience in parallel and prevents us from running into parallel nuget restores. 2016-06-10 16:54:39 -07:00
Livar Cunha
ed7e583ab6 Addressing code review comments and adding a DOTNET_SKIP_FIRST_TIME_EXPERIENCE env variable to have a way to turn off the feature. 2016-06-10 16:54:37 -07:00
Eric St. John
4d631cc1b1 Update dest path & fix race reporting progress 
Renaming destinationPath to destinationRelativePath for clarity.  This
string represents the path relative to the extract directory to which
files will be written.

We were missing an Interlocked.Increment during a parallel operation.
 2016-06-10 16:54:34 -07:00
Livar Cunha
bcadd6ff01 Fixing identation and spaces in a few files. 2016-06-10 16:54:31 -07:00
Bryan Thornbury
f27330a09b Revert "move all version suffixes to preview3 and rc4" 
This reverts commit 35432bcb4a32ddd6b672f86b206e2b1933eff035.
 2016-06-10 16:54:19 -07:00
Livar Cunha
69f43beccd Adding the code to extract the archive in the first use of dotnet an 
d added the first time use welcome text as well as some E2E tests.
 2016-06-10 16:54:16 -07:00
Livar Cunha
5f220a1677 Generating the archive in the sdk folder of stage2. 2016-06-10 16:54:14 -07:00
Livar Cunha
4c5f097d67 Adding the configurer to dotnet. 2016-06-10 16:54:11 -07:00
Livar Cunha
461c26b78d Adding a create method to the sentinel and invoking it from the Primer when appropriate. 2016-06-10 16:54:09 -07:00
Livar Cunha
ac2e21452f Adding a separate abstraction for the NuGet sentinel. 2016-06-10 16:54:06 -07:00
Eric St. John
8db7c1c4fb Add dotnet-archive application 2016-06-10 16:54:05 -07:00
Eric St. John
4949cedcc2 Fix progress for decompression 2016-06-10 16:54:04 -07:00
Eric St. John
e34d988f54 Clean up usings 2016-06-10 16:54:01 -07:00
Eric St. John
40bf17900a Add IndexedArchive 
This type will archive multiple files de-duplicated in a zip with a
central manifest that describes how to recreate the actual layout.
In addition, any other zip file will be expanded and deduplicated
so that we can further reduce the size of those zips/nupkgs.
All of these are placed in a zip with no-compression, essentially
using the zip as only a container.  We then LZMA compress that
container to achieve maximum compression.
 2016-06-10 16:54:00 -07:00
Eric St. John
e8a65dd546 Port LZMA SDK to .NETStandard1.0 as library 
We're builiding a library and don't need the application-related source
so I've removed this in addition to fixing the source to compile as
NETStandard1.0.
 2016-06-10 16:53:59 -07:00
Eric St. John
1cfdb41cef Initial commit of LZMA SDK 
This is a direct copy of the CS folder from the 16.02 SDK package.

I've added a README to indicate where this code came from.
 2016-06-10 16:53:58 -07:00
Bryan Thornbury
32962a14e2 move all version suffixes to preview3 and rc4 2016-06-10 16:53:57 -07:00
Livar Cunha
84f63029fe Almost all of the code to prime the NuGet cache from the archive. 
- Created a Configurer class that is responsible for deciding when to run the dotnet first time use
experience and invoke the NuGetCachePrimer.
- Added the NuGetCachePrimer which extract the archive and primes the cache.
-- This is just missing creating the sentinel once restore succeeds.
- Added a shell for the NugetPackagesArchiver, which will be responsible for expanding the archive (likely
replaced in the future by an abstraction from Eric's code or its implementation will simply call Eric's code).
- Added a TemporaryFolder abstration to Internal Abstractions that handles deleting the temporary folder once
we are done with it.
 2016-06-10 16:53:55 -07:00
Eric Erhardt
4293d05571 Porting @svick's fix to change a hard-coded URL to a redirect link. 2016-06-10 17:51:50 -05:00
Rob Relyea
c39fbd37d3 Merge pull request #3492 from dotnet/toddmosc/serviceable-p2 
Removing the nuspec schema change used for adding the serviceable tag.
 2016-06-10 10:04:16 -07:00
eerhardt
7b51f28c7f Updating CoreFx, CoreClr, CoreSetup to rc3-24210-06, rc3-24210-01, rc3-3004449-00 respectively 2016-06-10 15:05:30 +00:00
Todd Moscinski
013fa1b8c0 Removing the nuspec schema change used for adding the serviceable tag. 2016-06-10 07:51:10 -07:00
Eric Erhardt
ef4a8e85ef Updating CoreSetup to rc3-004443-00. 2016-06-10 01:09:46 -05:00
eerhardt
cd9bcd40b3 Updating CoreFx, CoreClr, CoreSetup to rc3-24209-08, rc3-24208-04, rc3-3004442-00 respectively 2016-06-09 21:14:15 -05:00
Ajay Bhargav Baaskaran
1d44105b4b [Fixes #3421] Made dotnet new templates generate portable pdbs 2016-06-09 12:05:54 -07:00
Lee Coward
cbf5f1ef65 Merge pull request #3458 from blackdwarf/prev2templates 
Add new templates for C# to dotnet new
 2016-06-09 10:17:26 -07:00
Zlatko Knezevic
4b1735bdaf Fixing F# template project.json 
Two changes:
1. Moving from netstandard1.5 to netcoreapp1.0
2. Fixing the version of F# netcore package
 2016-06-09 08:17:45 -07:00
Zlatko Knezevic
85e4ed2b74 Responding to PR feedback 2016-06-09 08:06:38 -07:00
Zlatko Knezevic
c066ef1540 Add C# Lib and xunittest templates 
Adding the C# lib and xunittest templates to `dotnet new`. These need
to be invoked with the `dotnet new -t lib` and `dotnet new -t
xunittest` keywords respectively.
 2016-06-09 08:06:03 -07:00
Zhi Li
9a9864bf68 Update NuGet Version to 3.5.0-beta2-1451 2016-06-09 07:52:00 -05:00
Eric Erhardt
f43aad780c Updating CoreFx, CoreClr, Roslyn, CoreSetup, DiaSymReader to rc3-24208-04, rc3-24208-04, beta1-20160608-03, rc3-004425, rc2-60608-04 respectively 2016-06-08 22:56:25 -05:00
Pranav K
a2d4f6fed0 Remove use of Microsoft.Extensions.PlatformAbstractions 2016-06-08 16:28:52 -07:00
Ajay Bhargav Baaskaran
3c9f8dd99b Merge pull request #3426 from dotnet/ajbaaska/dotnet-new-web2 
Added a web template to dotnet new
 2016-06-08 12:45:49 -07:00
Ajay Bhargav Baaskaran
4a88cff185 [Fixes #3255] Added a web template to dotnet new 2016-06-08 11:31:08 -07:00
Eric Erhardt
71d39a4a19 Update Microsoft.DiaSymReader.Native to 1.4.0-rc2 2016-06-08 12:01:35 -05:00
Eric Erhardt
d2f1fa0300 Updating CoreFx, CoreClr, CoreSetup to rc3-24207-03, rc3-24207-03, rc3-004415 respectively. 2016-06-07 18:24:30 -05:00
Jonathan Miller
cff4f37456 Merge pull request #3411 from sokket/json 
Bumping JSON.NET to 9.0.1
 2016-06-07 16:17:00 -07:00
Jonathan Miller
30ba1a1a61 Merge pull request #3413 from sokket/cycle 
Adding check for self-referencing projects
 2016-06-07 16:16:54 -07:00
Jonathan Miller
cdf4407419 Bumping JSON.NET to 9.0.1 2016-06-07 15:04:17 -07:00
Eric Erhardt
2e7c467aad Merge pull request #3407 from dotnet/dev-ragrawal-updatenuget 
update nuget to 3.5.0-beta2-1392
 2016-06-07 15:50:13 -05:00
Jonathan Miller
dc5fbc1a91 Adding basic cycle detection in the dependency walker 2016-06-07 13:21:13 -07:00
Eric Erhardt
0b30b148f3 Merge pull request #3376 from eerhardt/MergePreview2 
Merge rel/1.0.0-preview2 into rel/1.0.0
 2016-06-06 19:03:01 -05:00
Eric Erhardt
334b079995 Updating CoreSetup, Roslyn, DiaSymReader to rc3-004408, beta1-20160606-02, 1.0.8-rc2-60606-01 respectively. 2016-06-06 18:56:24 -05:00
Andrew Stanton-Nurse
dd51836aac fix #2289 by integrating EF's version of project load context (#3402) 2016-06-06 15:08:46 -07:00
Rohit Agrawal
5378f5a697 update nuget to 3.5.0-beta2-1392 2016-06-06 14:14:20 -07:00
Todd Moscinski
d3b935489f Fixing schema version number, tweaking a string, and making test call pass a bool instead of a string to enable serviceable. 2016-06-06 11:00:47 -07:00
Todd Moscinski
391675c5b9 Changing schema version to 8 to match NuGet internal value and adding a pack test for the --serviceable option. 2016-06-06 11:00:33 -07:00
Todd Moscinski
8099e6b9f7 Adding support for --serviceable option to pack command which puts <serviceable>true</serviceable> into the output nuspec 2016-06-06 11:00:05 -07:00
Eric Erhardt
90fbc3bb53 Merge pull request #3399 from eerhardt/UpdateSharedFX 
Updating CoreSetup to rc3-004406
 2016-06-06 12:13:53 -05:00
Eric Erhardt
ea1b688527 Merge pull request #3394 from eerhardt/Fix1650 
Change 'got' to 'received' for dep conflicts
 2016-06-06 11:59:30 -05:00
Eric Erhardt
42938f180f Updating CoreSetup to rc3-004406 2016-06-06 11:15:07 -05:00
Luke Latham
d76807d22a Change 'got' to 'received' for dep conflicts 2016-06-06 09:35:24 -05:00
eerhardt
354b1d38d5 Updating CoreFx, CoreSetup to rc3-24206-00, rc3-004404 respectively 2016-06-06 14:24:51 +00:00