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

170 commits

Author SHA1 Message Date
Livar
2aa166b5d0 Merge pull request #5069 from livarcocc/version_attributes 
Making version an attribute for packagereference and dotnetclitoolreference
 2016-12-19 09:48:00 -08: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
Livar Cunha
e1c0bbe0f7 Making version an attribute for packagereference and dotnetclitoolreference. 2016-12-16 19:13:37 -08:00
Livar
a9ca6d8c5b Merge pull request #5062 from livarcocc/clean_empty_targets_migration 
Added a clean empty targets method to CleanOutputProjectRule
 2016-12-16 18:07:37 -08:00
Livar Cunha
d6d6fc612b Added a unit test for cleaning empty targets. 
Added a clean empty targets method to CleanOutputProjectRule that removes any targets without content inside of them from the csproj.
 2016-12-16 13:31:42 -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
Livar Cunha
56dd76bdb0 Adding Update under Content for BuildOptions as well, but limiting this change only to Web Apps at the moment, because regular SDK does not have Content Include=**/* in place yet. 2016-12-13 16:45:40 -08:00
Livar Cunha
a22f4be938 Adding a UpdateContextTransform that generates items with the Update attribute set instead of Include. Also, removed the Exists condition for published content, because now that we are using Update, that check is not needed. I left the option to set a condition on the metadata though. 2016-12-13 16:45:39 -08:00
Livar Cunha
84682562bf Adding a condition to Content CopyToPublishDirectory to validate that the file exists before trying to copy it to output, to keep the same functionality as it existed in PJ. In MSBuild world, without this condition, CopyToPublishDirectory will fail. 2016-12-13 16:45:39 -08:00
Livar
bd590f51e6 Emitting PackageId whenever we emit AssemblyName. We need to do this to preserve the behavior from PJ where the package id matched the containing PJ folder name. In MSBuild, PackageId will match AssemblyName, unless it is explicitly specified. (#4990) 2016-12-09 16:10:16 -08:00
Piotr Puszkiewicz
70c8ecbf16 Merge branch 'rel/1.0.0' into migrate_pj_without_frameworks 2016-12-09 00:30:36 -08:00
Livar
1fd99f1588 Merge rel/1.0.0-preview4 back into rel/1.0.0 (#4974) 
* Updating the preview4 channel to rel-1.0.0-preview4

* Add more xlf files for new strings

* bundle fsharp sdk, only Sdk directory is required

* align f# console proj

* align f# lib template

* align f# mstest template

* align f# xunit template

* align f# web template

* fix mstest package version, aligned to c#

* remove unused directories from bundled sdks

* Adding a SdkNugetVersion property when invoking dotnet pack on test packages so that test packages can reference exact packages. We need that because of https://github.com/NuGet/Home/issues/4063. Without it, pack creates the nuspec with a version like 1.0.0-version-, instead of 1.0.0-version-<version_used_in_build>, which leads to problems when restoring the tool. Like, it ends up restoring to the closest version of the package (oldest), instead of the latest.

* Update web template for Web SDK 154 (#4948)

* Update WebSDK version

* Update web template to get rid of globs

https://github.com/aspnet/Templates/pull/735

* MSBuild to 15.1.458 (#4950)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet (#4963)

* Adding MigrateWebSdkRule to the DefaultMigrationRuleSet and adding a E2E test to cover it.

* Do not migrate compile and EmbeddedResources for web application, because those are included in the Web Sdk already.

* Addressing code review comments
 2016-12-09 00:30:02 -08:00
Livar Cunha
9bddb5bac7 Addressing code review comments. 2016-12-08 20:06:55 -08:00
Livar Cunha
bb1bceb8bb When we had a project.json without frameworks, we were failing to show the appropriate error message because when we were generating the error message itself we tried to access the project context (which requires a framework in the PJ). This fix makes the ProjectContext optional to add the migration error. 2016-12-08 19:53:35 -08:00
Justin Goshi
0831316321 Allow migration of sln files (#4949) 
* WIP Migrate sln files

* WIP add reference to redist

* Adding tests and fixing a few bugs

* Fix some tests

* Remove use of DeepClone

* Fix test build errors

* Fix more tests
 2016-12-07 11:49:15 -10:00
Livar Cunha
c94934dfc5 Replacing snake casing with Camel casing for GivenThatIWantToMigrateBuildOptions. At some point, I will be able to change them all. 2016-12-05 20:34:11 -08:00
Livar Cunha
9d96bf8c20 Adding GenerateRuntimeConfigurationFiles when migrating a test project. 2016-12-05 18:23:34 -08:00
Piotr Puszkiewicz
d6cab4af58 use Sdks attribute in dotnet new templates (#4916) 
* Move dotnet-new templates to Sdk attribute

* Update to MSBuild 15.1.0-preview-000454-01

To pick up a fix for Microsoft/msbuild#1431.

* Fix template newlines

* Fix casing on Microsoft.Net.Sdk

* Move migration test csproj's to Sdk attribute

* Disable parallel sdk restore

Each SDK restore operation will try to manipulate the same assets.json file since the dependency name&version are injected into a common csproj file. This can cause runtime failures when two NuGets try to restore the project at once.

* Make casing of SDK 'NET' and not 'Net'

* Remove redundatn imports

* Fix test string

* Additional race

* Replacing the SDK with the Web.Sdk when it is a Web project.

* Fixing the test by writting the csproj before running the migration rule.
 2016-12-04 22:31:58 -08:00
Livar Cunha
7583bcb2fd Skipping dotnet publish-iis when migrating scripts as it is now part of the web.sdk 2016-12-02 10:41:25 -08:00
Piotr Puszkiewicz
da82bdb05d Centralize Microsoft.Net.SDK Version (#4890) 
* Centralize Microsoft.Net.Sdk package version

Note: Templates were omitted as their version needs to be static.

* Unifying additional missmatched versions

* prefercliruntime

whitespace threw off ReplaceAll

* Additional missed globs

* Revert SDK version for performance tests

* PR Feedback

* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
 2016-12-02 09:34:03 -08:00
Martin Andreas Ullrich
4af30914c9 Show meaningful error when failing to migrate invalid scripts (#4842) 2016-11-30 20:36:13 -08:00
Livar
9847196c95 Merge pull request #4737 from livarcocc/migrate_authors 
Adding Authors migration.
 2016-11-16 09:29:13 -08:00
Livar
11f871b715 Merge pull request #4733 from livarcocc/migrate_adds_rids_for_desktop 
Emitting runtime identifiers if the source project has any full framework TFMs
 2016-11-16 09:29:01 -08:00
Justin Goshi
be61afcfa5 Remove unused project.json and .xproj files (#4735) 
* Remove unused project.json and .xproj files

* Update the test msi script
 2016-11-15 16:12:19 -10:00
Livar Cunha
c364f27346 Adding Authors migration. 2016-11-15 16:36:04 -08:00
Livar Cunha
9513428013 Emitting runtime identifiers if the source project has any full framework TFMs. 2016-11-15 14:07:35 -08:00
Piotr Puszkiewicz
bf425a6f0a Removing dotnet-test-mstest when migrating because that package is no longer needed. (#4690) 2016-11-14 14:59:59 -08:00
Justin Goshi
6d57ca7e14 Migrating all test projects (#4668) 
* WIP migrate tests

* WIP fixing more tests

* WIP fix test build break

* Test results files are now trx

* Get CI to pass until we get an xunit xml logger

* Added DotNetTestPJ since that was needed for one test

* Fix build break

* Forgot to add DotNetTestPJ as a build task

* Need to restore project.json for the project used in ubuntu test

* Restore PJ for ubuntu test

* Switch the Ubuntu test to csproj based
 2016-11-11 21:46:29 -10:00
Livar Cunha
df755b5554 Removing dotnet-test-mstest when migrating because that package is no longer needed. 2016-11-11 10:52:33 -08:00
Livar
43dfa6b8ba Updating script migration to use the correct BeforeTargets. (#4680) 2016-11-10 18:24:35 -08:00
Livar
9869b82412 Merge pull request #4662 from livarcocc/remove_dotnet_test_xunit_migration 
Removing dotnet-test-xunit when migration from project.json to csproj
 2016-11-09 11:11:17 -08:00
Livar Cunha
7f549314ff Removing dotnet-test-xunit when migration from project.json to csproj, as that package is no longer needed. 2016-11-09 09:52:52 -08:00
Livar
312559ccdc Merge pull request #4636 from Faizan2304/xunitTemplateFix 
Update version of xunit adapter in test assets and xunit template
 2016-11-08 14:42:47 -08:00
Faizan Ahmad
c9a5c95cd6 Updated test to reflect xunit version change 2016-11-09 01:23:46 +05:30
Livar Cunha
ef90667375 Hoisting FrameworkAssemblies for desktop frameworks during migration. 2016-11-07 16:16:48 -08:00
Livar
d6eef01015 Adding a tool migration for BundleMinifier.Core to move all version of the tool to 2.2.301 during migration. (#4613) 2016-11-03 19:55:52 -07:00
Livar
de5da5870f Marking hoisted P2P projects with a FromP2P attribute. (#4598) 2016-11-03 10:27:51 -07:00
Livar
14c285db1c Merge pull request #4583 from NTaylorMullen/nimullen/removert 
Remove Razor.Tools/Razor.Design from migration logic.
 2016-11-02 21:21:20 -07:00
Livar
d84c89be15 Merge pull request #4589 from livarcocc/cleanup_migration 
Cleanup migration
 2016-11-02 17:03:29 -07:00
N. Taylor Mullen
411dd02923 Remove Razor.Tools/Razor.Design from migration logic. 
- Razor.Tools/Razor.Design will not be shipping with MSBuild support for the upcoming release.
 2016-11-02 15:16:57 -07:00
Livar Cunha
4e1f2f2b20 Removing TFM specific defines for migrated projects, since they are not being set in the SDK itself. 2016-11-02 15:05:45 -07:00
Justin Goshi
d1772f6ed4 Add mstest support (#4572) 
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* WIP adding new mstest templates

* Auto-inject mstest dependencies when testrunner is set to mstest

* WIP trying to get new web test to work

* Get dotnet new -t Web test to pass

* Remove whitespace and accidentally added (redundant) tests

* Shorten test method name
 2016-11-02 08:49:45 -10:00
Livar Cunha
0c833f5349 Making the default exclude option empty, so that by default, we don't set any excludes for compile or embed during migration. 2016-11-02 10:11:37 -07:00
Krzysztof Wicher
d520160ce3 Merge pull request #4554 from krwq/fix_lib_wo_netstandard 
When Library add reference to NETStandardLib if not present
 2016-11-01 16:50:47 -07:00
Livar
aaa343a1c8 Merge pull request #4566 from livarcocc/migrate_unqualified_references 
Migrating unqualifing references as projects
 2016-11-01 15:54:45 -07:00
Krzysztof Wicher
e3bc102b06 When Library add reference to NETStandardLib if not present 2016-11-01 15:52:24 -07:00
Krzysztof Wicher
875e275e38 Revert "When Library add reference to NETStandardLib if not present" 
This reverts commit 57d79bb2d3.
 2016-11-01 15:45:14 -07:00
Krzysztof Wicher
57d79bb2d3 When Library add reference to NETStandardLib if not present 2016-11-01 15:34:17 -07:00
Justin Goshi
155ef033f2 Migrate: auto-inject test dependency version (#4565) 
* Migrate: auto-injected dependencies should overwrite existing dependency version if present

* Address PR comments
 2016-11-01 12:10:51 -10:00
Livar Cunha
23a44f192f Fixing the test on windows. We need to use path.combine because of the forward/backward slashes for directory separation. 2016-11-01 14:58:11 -07:00
Livar Cunha
82ff6397f5 Migrating unqualifing references as projects if we find a matching project. Without this, we have project references being migrated as package references. 2016-11-01 14:17:12 -07:00
Justin Goshi
f9493545dc Address PR comments to improve test readability and reliability 2016-10-31 20:50:52 -07:00
Justin Goshi
45ccc74ace Merge from rel/1.0.0 2016-10-31 20:00:15 -07:00
Justin Goshi
4cd74bff88 Only add the xunit references if the test running is xunit 2016-10-31 15:55:22 -07:00
Justin Goshi
4ea37c91a8 Migrate: add package dependencies to test projects 2016-10-31 13:59:47 -07:00
Livar Cunha
be2ab211f1 Addressing code review comments. 2016-10-31 12:39:03 -07:00
Livar Cunha
b16c9018b6 Adding a map of asp tools packages that tells which versions we need to migrate and to what. Any package in that list, will also have its version updated. 2016-10-31 12:33:01 -07:00
Livar
5a621b53e2 Merge pull request #4540 from livarcocc/issue4492/migrateWeb 
Issue4492/migrate web
 2016-10-31 12:26:26 -07:00
Piotr Puszkiewicz
5ede3b6367 post migration cleanup (#4449) 
* Create tests

* Basic scenario working & tested

* Feature Complete

* prevent build of intentionally broken test asset

* Update migrate command backup

* PR Feedback

* Move negative test to negative test directory

* Fix tests

* make test output directories unique

* Merge Conflict

* make backup the default behavior

* Pass2Fail

* Remove tests' PJ dependency
 2016-10-29 01:58:37 -07:00
Livar Cunha
9e88b811a0 Refactoring the ProjectTypeDetector to use the Project in the MigrationInputs. 2016-10-29 00:33:22 -07:00
Mike Lorbetske
2d27092513 Fix the test for web project migration 2016-10-29 00:33:22 -07:00
Mike Lorbetske
e847389fc2 Update migration to use the web template as a base for web projects 2016-10-29 00:33:22 -07:00
Livar Cunha
fa6aa749bd Doing a tree traversal of all dependencies and creating a list that is then added to the project dependencies of the project. 2016-10-27 20:08:53 -07:00
Piotr Puszkiewicz
6fcbefa4f7 [WIP] Removes *3 verbs, making msbuild the driver (#4456) 
Removes *3 verbs, making msbuild the driver
 2016-10-27 18:46:43 -07:00
Livar
53dc665e9b Merge pull request #4505 from livarcocc/assembly_info_migration 
Assembly info migration
 2016-10-26 17:00:22 -07:00
Justin Goshi
68afda8e4d Handle "runtimes" section (#4503) 
* Migrate "runtimes" section as a RuntimeIdentifiers property in the resulting csproj file. Also do not call restore3 from publish3 anymore.

* Fix up the publish3 tests to call restore3 first and the csproj files to have RuntimeIdentifiers
 2016-10-26 22:23:40 +00:00
Livar Cunha
f863630fd8 Adding a rule that turns off assembly info generation for attributes already defined when migrating. 2016-10-26 13:55:15 -07:00
Livar
7149c722b1 Merge pull request #4496 from livarcocc/issue_4486 
Merging metadata with different values
 2016-10-25 22:26:21 -07:00
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
Bryan Thornbury
fbaf9a679e Project Migration Report 2016-10-06 15:56:15 -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