Commit graph

424 commits

Author SHA1 Message Date
Piotr Puszkiewicz
a101c703a1 First try at refactor of Prepare.targets (#5647)
* First try at refactor of Prepare.targets

* Enable restore of CLI build tasks

* Fix up build

* Feedback

* Newlines

* Add new props to sln

* CommitCount

* NuGet.config

* WorkingDir

* packages dir path

* Add missing nuget.configs

* Workaround for https://github.com/NuGet/Home/issues/4583

* Match NuGet.Config casing

* Put back Version Badge Properties

* Remove duplicate
2017-02-13 13:06:30 -08:00
Livar Cunha
9f2ca9989c Introducing a in DependencyVersions to facilitate these updates in the future. Also aligns with master. 2017-02-10 23:05:16 -08:00
Livar Cunha
1d61bf97ed Updated the Shared Framework to 1.1.1 and 1.0.4. 2017-02-10 23:05:16 -08:00
Justin Emgarten
1c256d7c56 Removing extra PackageReference workaround for tests
Fixes https://github.com/NuGet/Home/issues/4416
2017-02-07 14:31:27 -08:00
Piotr Puszkiewicz
b0a5d53ed5 Merge rel/1.0.0 to master 2017-02-06 12:43:57 -08:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Livar
408a0afe8e Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 15:53:10 -08:00
jonsequitur
905db127a6 use missing package test to verify correct package feed parsing 2017-02-01 14:13:07 -08:00
Livar Cunha
0c411e7e1f Adding another global.json to a failing test asset. 2017-02-01 13:58:15 -08:00
Livar Cunha
0c338ced75 Fixing a failing test. Basically, now that global.json paths have precedence, we were using the CLI global.json and finding the wrong project dependencies. 2017-02-01 12:15:00 -08:00
Rohit Agrawal
4c55fb6211 update nuget and sdk rtm-2241 (#5447)
* update nuget and sdk rtm-2241

* Applying the no packagereference workaround.

* Fix merge issue

* add comments for restore related workarounds added in test assets
2017-01-27 19:12:35 -08:00
Krzysztof Wicher
d6d39a5c9d fix 5466: explicity including a file causes a build break (#5475)
* fix 5466: explicity including a file causes a build break

* fix failing unit tests

* Add unit tests and apply fix also to includeFiles

* apply review feedback
2017-01-27 18:39:44 -08:00
Livar
60f2b2e4ab Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-26 20:46:56 -08:00
jonsequitur
573c4efea5 test fixes 2017-01-26 14:48:40 -08:00
jonsequitur
0c80992384 move additional tests to netcoreapp1.1 2017-01-26 14:48:40 -08:00
Justin Goshi
2cc4f3f166 Merge branch 'rel/1.0.0' into dev/jgoshi/handleDeprecatedPJ 2017-01-26 14:28:37 -08:00
Krzysztof Wicher
3fa73a90d4 fix EOL in test asset 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
b8d4010d85 Handle some of the deprecated properties 2017-01-25 12:30:56 -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
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
Livar
c4e2c35d25 Merge branch 'rel/1.0.0' into migrate_global_json 2017-01-19 12:25:35 -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
Krzysztof Wicher
3e2b28f9eb fix a warning in a test asset causing test failure 2017-01-18 13:41:57 -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
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
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
Livar Cunha
0ebb92f3c4 Renaming a test asset to avoid running into long path issues on Windows. 2017-01-06 11:34:37 -08:00
Livar Cunha
b60b134674 Updating the M.NC.App version to 1.0.3 on a couple of new test assets. 2017-01-05 22:57:16 -08:00
Livar Cunha
7e5f18b584 Fixing full framework tests. 2017-01-05 22:55:43 -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
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
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 Cunha
205244fb8a Fixing failing test and making it work with the new SDK 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
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
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
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
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
fadacc0aac Updating the projects files in the repo to use the SDK attribute. 2016-12-20 15:52:50 -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
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
Justin Goshi
45264edcd7 Merge branch 'rel/1.0.0' into dev/jgoshi/removeProj 2016-12-16 14:53:33 -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
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
20f2242947 Adding dotnet remove project tests 2016-12-15 15:48:04 -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