Commit graph

95 commits

Author SHA1 Message Date
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
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
883eb2e82f Removing a test that is not necessary. 2016-10-20 15:53:31 -07:00
Livar Cunha
095105f2ec Addressing code review comments. 2016-10-20 14:35:45 -07:00
Livar Cunha
dc0d87c826 Adding an additional test to validate mappings to the root of the package. 2016-10-20 11:56:30 -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 Cunha
e2e72a9662 Updating the msbuild templates in the CLI to use TargetFramework (singular). 2016-10-18 15:02:35 -07: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
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
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
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
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
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
Bryan Thornbury
310da80c3a remove write 2016-10-05 11:39:14 -07:00
Bryan Thornbury
1232a38e51 dotnet cli migrate tools ref 2016-10-05 11:36:23 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Livar Cunha
68e1aae6cc Fixing tests. 2016-09-30 09:27:15 -07: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
a0aa51777f Merge pull request #4233 from livarcocc/migrate_packOptions
Adding migrate PackOptions capabilities.
2016-09-22 17:57:08 -07:00
Bryan Thornbury
5523f24712 fix tests 2016-09-22 17:16:37 -07:00
Livar Cunha
768e289f0c Adding migrate PackOptions capabilities. 2016-09-22 16:14:27 -07:00
Bryan Thornbury
95e0ed3713 fix errors, enable tests 2016-09-22 14:30:56 -07:00
Bryan Thornbury
3e6e1ddcd0 add support for conditioned csproj references, add tests 2016-09-22 12:51:23 -07: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
5d2f0579d2 Migrate xproj to csproj dependencies 2016-09-21 17:27:02 -07:00
Bryan Thornbury
08fbe7f9d1 remove debug 2016-09-21 14:51:31 -07:00
Bryan Thornbury
2dd99ce015 improve finding encompassed items in a configuration 2016-09-21 14:41:16 -07:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
9d46a19c59 TFM 2016-09-19 09:16:36 -07:00
Bryan Thornbury
fe20698d81 PR Feedback 2016-09-16 16:37:48 -07:00
Bryan Thornbury
944eb1e787 Migration X-Targeting 2016-09-15 15:54:10 -07:00
Bryan Thornbury
ce47a64870 fixup namespaces and keyfile 2016-09-14 15:30:11 -07:00
Bryan Thornbury
7b5ca2da34 Add Scripts environment variable support 2016-08-31 15:30:23 -07:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00
Bryan Thornbury
28e2aa493d ProjectJsonMigration Tests 2016-08-30 12:00:11 -07:00