Commit graph

4642 commits

Author SHA1 Message Date
jonsequitur
473e28c26b remove tool_csc cleanup 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
add5f72573 Simplify desktop test packaging 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e0f46f9de4 add missing suffix component 2017-01-26 14:48:41 -08:00
Piotr Puszkiewicz
e089f8753e Account for NuGet/Home#4404 2017-01-26 14:48:41 -08:00
jonsequitur
4985804ba2 update Roslyn to 2.0.0-rc4-61325-08 2017-01-26 14:48:41 -08:00
jonsequitur
89ff57f51b only build desktop-and-portable TestPackage on Windows 2017-01-26 14:48:41 -08:00
jonsequitur
f66dbdb4b4 dotnet-desktop-and-portable.csproj to netcoreapp1.1 2017-01-26 14:48:41 -08:00
jonsequitur
25e3395684 dotnet-desktop-and-portable.csproj to netcoreapp1.0 2017-01-26 14:48:40 -08:00
Piotr Puszkiewicz
cc30bdde8a Make Deb tests test Deb 2017-01-26 14:48:40 -08:00
jonsequitur
bed3d974d6 add netcoreapp1.1 to Ubuntu installer 2017-01-26 14:48:40 -08:00
jonsequitur
573c4efea5 test fixes 2017-01-26 14:48:40 -08:00
jonsequitur
3cba07288d remove redundant ToolPath setting 2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384 move additional tests to netcoreapp1.1 2017-01-26 14:48:40 -08:00
jonsequitur
9824fa945b FluentAssertions 4.18.0 2017-01-26 14:48:40 -08:00
jonsequitur
927f0b6dc5 rebase fix 2017-01-26 14:48:39 -08:00
jonsequitur
d55be626a9 netcoreapp1.1 fixes 2017-01-26 14:48:39 -08:00
Eric Erhardt
cfb4cc3cb9 Update tests to netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Eric Erhardt
0073fc8534 Update CLI to run on netcoreapp1.1. 2017-01-26 14:48:39 -08:00
Livar
1fe1c3af01 Merge pull request #5429 from krwq/i5316
Fix: Migration: explicit compile include *.cs results in a build break
2017-01-26 14:20:45 -08:00
Livar
29afc0622e Merge branch 'rel/1.0.0' into i5316 2017-01-26 13:17:44 -08:00
Livar
cb34818237 Merge pull request #5469 from jchannon/patch-2
Add instruction to add global.json to preview2
2017-01-26 12:33:17 -08:00
Krzysztof Wicher
7a65922895 apply review feedback 2017-01-26 09:02:28 -08:00
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
Jonathan Channon
efa8dcdfd8 Add instruction to add global.json to preview2 2017-01-26 13:09:07 +00:00
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
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
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