Commit graph

4842 commits

Author SHA1 Message Date
Krzysztof Wicher
3fa73a90d4 fix EOL in test asset 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
ecd034b95c fix build errors after rebase 2017-01-26 09:02:28 -08:00
Krzysztof Wicher
000734d1ef Ignore explicit glob **/*.cs 2017-01-26 09:02:28 -08:00
Justin Goshi
ddf3261a67 Add more tests 2017-01-26 08:34:36 -08:00
Jonathan Channon
efa8dcdfd8 Add instruction to add global.json to preview2 2017-01-26 13:09:07 +00:00
Justin Goshi
150e3c4313 Add more tests 2017-01-25 17:28:57 -08:00
Justin Goshi
b8d4010d85 Handle some of the deprecated properties 2017-01-25 12:30:56 -08:00
Livar Cunha
6af1648543 Bumping the SDK version to 1.0.0-alpha-20170123-1. 2017-01-25 10:33:38 -08:00
Justin Goshi
40a19a6160 Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-25 09:55:24 -08:00
Justin Goshi
e17c44eddd WIP 2017-01-25 09:53:59 -08:00
Abhitej Anoop John Bandi
93651da836 Updating the MSTest nugets with the ones shipping in VS for desktop and UWP scenarios. 2017-01-25 19:44:50 +05:30
Piotr Puszkiewicz
56d8071361 Merge pull request #5423 from dasMulli/patch-1
Fix in German translation for dotnet-add-reference
2017-01-24 18:55:15 -08:00
Piotr Puszkiewicz
38fa2548f6 Merge branch 'rel/1.0.0' into patch-1 2017-01-24 16:49:25 -08:00
Piotr Puszkiewicz
41123fadaa Merge pull request #5432 from dotnet/dev/jgoshi/issue5355
Migrate sln should remove global.json from the sln file
2017-01-24 16:48:57 -08:00
Eric Erhardt
7cb76c2ade Update run-build to install the latest stage0 from the rel-1.0.0 channel. 2017-01-24 17:56:28 -06:00
Eric Erhardt
15930fac0f Fix build with latest stage0. 2017-01-24 17:53:19 -06:00
Justin Goshi
8fd09b18fa Merge branch 'dev/jgoshi/issue5355' of https://github.com/dotnet/cli into dev/jgoshi/issue5355 2017-01-24 15:02:42 -08:00
Justin Goshi
861d1edfd3 Address PR comments 2017-01-24 15:02:19 -08:00
Piotr Puszkiewicz
900f954075 Merge branch 'rel/1.0.0' into patch-1 2017-01-24 14:57:17 -08:00
Justin Goshi
55e80fa036 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5355 2017-01-24 14:56:38 -08:00
Piotr Puszkiewicz
df2af27787 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5355 2017-01-24 14:16:14 -08:00
Piotr Puszkiewicz
82d80f0da0 Merge pull request #5441 from dotnet/blackdwarf-patch-2
Update LocalizableStrings.cs
2017-01-24 14:15:51 -08:00
Livar
c109dc29b7 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5355 2017-01-24 11:58:35 -08:00
Zlatko Knezevic
d522a97318 Update LocalizableStrings.cs
Change the migration after-process message with the link.
2017-01-24 11:40:39 -08:00
Justin Goshi
731ab92c1f Update the test 2017-01-24 10:57:07 -08:00
Piotr Puszkiewicz
0de3338607 Merge pull request #5433 from mlorbetske/rel/1.0.0-rc3
Update version of Microsoft.AspNetCore.Mvc
2017-01-24 03:08:13 -08:00
Piotr Puszkiewicz
7c62621b8f Merge branch 'rel/1.0.0-rc3' into rel/1.0.0-rc3 2017-01-24 03:07:49 -08:00
Mike Lorbetske
212f1a145a Merge pull request #1 from piotrpMSFT/mlorbefix
Mlorbefix
2017-01-24 02:36:48 -08:00
Piotr Puszkiewicz
f4f325f1d5 Cleanup 2017-01-24 02:36:04 -08:00
Piotr Puszkiewicz
131c63ae27 Generate lzma nuget.config when needed 2017-01-24 02:30:24 -08:00
Piotr Puszkiewicz
ad8710decc SDK 20170123-1 (#5434)
* Revert "Merge pull request #5362 from dotnet/ragrawal/updatesdktrial"

This reverts commit 4e0b465093.

* bump SDK to 20170123-1
2017-01-24 01:14:35 -08:00
Mike Lorbetske
b31b2f429d Add NuGet feed 2017-01-24 00:43:47 -08:00
Mike Lorbetske
872e96cfe2 Update version of Microsoft.AspNetCore.Mvc 2017-01-23 20:21:58 -08:00
Livar
6c623d9d98 Localizing MigrateCommand and fixing one string for dotnet test. (#5419) 2017-01-23 20:19:53 -08:00
Arun Mahapatra
aa0359cd9a Insert test platform v15.0.0-preview-20170123-02 (#5426)
* Insert test platform v15.0.0-preview-20160120-03.

Remove OutputType from test project templates since it is
automatically determined by Microsoft.NET.Test.Sdk.

* Update testplatform v15.0.0-preview-20170123-02.
2017-01-23 13:54:08 -08:00
Justin Goshi
a2088e2641 Refactor and finish the feature 2017-01-23 13:01:58 -08:00
Justin Goshi
3884c90938 Merge from rel/1.0.0 2017-01-23 10:25:16 -08:00
Piotr Puszkiewicz
1dfee9ead8 [WIP] Reduce test target complexity [and running time] (#5403)
* Reduce test target complexity [and running time]

* WiP

* Enable building tests via solution

Remove deprecated tests
Make Microsoft.DotNet.Tools.Tests.Utilities portable-only
Remove MSI tests from the solution as they are the only  tests that currently require dekstop.

* Enable building of tests

* Move migration tests to TA to allow them to self-restore

* Reduce project nesting and test directory name
2017-01-22 14:40:00 -08:00
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
Mike Lorbetske
8ac7312fa3 Take the latest WebSDK version to absorb a publish output directory change (#5409) 2017-01-20 23:03:03 -08:00
Livar
8af06ac7ee Merge pull request #5391 from smadala/add-rd
Add results directory arg to dotnet test
2017-01-20 20:36:11 -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
Livar
6bb76cf20e Merge pull request #5393 from dotnet/dev/jgoshi/issue5343
Migration: do not add a csproj to the solution if it already exists
2017-01-20 17:13:48 -08:00
Livar
0963a0a5f6 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 16:21:06 -08:00
Livar
c8c19a488e Create migration-issues.md (#5408)
* Create migration-issues.md

Instructions on how to file migration issues.

* Update migration-issues.md

* Update migration-issues.md

* Update migration-issues.md
2017-01-20 14:11:39 -08:00
Piotr Puszkiewicz
fe290f1e26 Merge branch 'rel/1.0.0' into dev/jgoshi/issue5343 2017-01-20 14:08:49 -08:00