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

4642 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
93a94e652b Merge pull request #5398 from livarcocc/add_help_message_to_migrate 
Adding an extra message to the migrate result
 2017-01-19 23:07:20 -08:00
Livar
a9044e05e3 Merge pull request #5399 from livarcocc/migrate_sln 
Adding a test that verifies that running dotnet migrate solution.sln will only migrate the projects in the solution file.
 2017-01-19 20:39:15 -08:00
Livar
870f7edc87 Merge branch 'rel/1.0.0' into migrate_sln 2017-01-19 18:42:00 -08:00
Livar
e63867d324 Merge branch 'rel/1.0.0' into add_help_message_to_migrate 2017-01-19 18:40:55 -08:00
Piotr Puszkiewicz
b78e7a1b28 Merge pull request #5395 from krwq/test_assets_flakiness 
Fix some flakiness around test assets
 2017-01-19 17:44:21 -08:00
Krzysztof Wicher
8ef670161b isolate exclusive folder access pattern into separate class 2017-01-19 16:43:54 -08:00
Piotr Puszkiewicz
dd59e2ce97 Merge pull request #5130 from blackdwarf/slntest 
Introducing solution file for test projects
 2017-01-19 16:12:38 -08:00
Krzysztof Wicher
e271b4a818 InvalidOperationException -> ArgumentException 2017-01-19 15:56:16 -08:00
Livar Cunha
dbf4b5de77 Adding a test that verifies that running dotnet migrate solution.sln will only migrate the projects in the solution file. 2017-01-19 13:59:31 -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
Livar Cunha
7f4273d4b1 Adding one more test to ensure that migrate global.json will continue to target only projects under the global.json's project node. 2017-01-19 12:24:42 -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
Livar
6568113e34 Merge pull request #5374 from krwq/2017-01-18-merge-rc3-into-rel 
Merge RC3 into rel/1.0.0
 2017-01-19 09:23:39 -08:00
Satya Madala
44b14f987e Add results directory arg to dotnet test 2017-01-19 11:27:37 +05:30
Krzysztof Wicher
3e2b28f9eb fix a warning in a test asset causing test failure 2017-01-18 13:41:57 -08:00
Zlatko Knezevic
4852369e37 Merge branch 'rel/1.0.0' into slntest 2017-01-18 13:35:13 -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
Zlatko Knezevic
e365eb7591 Responding to PR feedback 2017-01-18 12:04:18 -08:00
Livar
908b6515cb Merge pull request #5335 from v-zbsail/localization 
LOC CHECKIN | dotnet/cli | 20170116
 2017-01-18 11:20:08 -08:00
Livar
073daaf450 Merge branch 'rel/1.0.0' into localization 2017-01-18 10:03:18 -08:00
Zlatko Knezevic
20b06d1f21 Adding back a \n 2017-01-17 22:58:34 -08:00
Zlatko Knezevic
0ce6b0cc0f Merge branch 'rel/1.0.0' into slntest 2017-01-17 21:12:11 -08:00
Livar
691189ef91 Merge pull request #5368 from dotnet/piotrpMSFT/bump/SDK20170117-4 
bump SDK to 20170117-4
 2017-01-17 17:41:03 -08:00
Piotr Puszkiewicz
964f0177d8 20170117-4 2017-01-17 16:33:36 -08:00
Livar
4f0b7bd58c Merge pull request #5364 from livarcocc/package_reference 
Check that a folder contains a project before considering it a P2P dependency
 2017-01-17 15:47:19 -08:00
Livar
2b9e90cdc5 Merge pull request #5366 from dotnet/dev/jgoshi/issue5353 
Migration updates visual studio version
 2017-01-17 15:39:38 -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
Zlatko Knezevic
d93b7abca0 Merge branch 'rel/1.0.0' into slntest 2017-01-17 12:53:44 -08:00
Piotr Puszkiewicz
61b7841087 bump core sdk to 1.0.0-alpha-20170117-1 (#5358) 2017-01-16 20:02:02 -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
18d7007202 Merge pull request #5348 from livarcocc/update_xunit 
Updating the versions of xunit 2.2.0-beta5-build3474 and xunit runner to 2.2.0-beta5-build1225.
 2017-01-16 15:59:35 -08:00