Commit graph

186 commits

Author SHA1 Message Date
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
281eca2f8c Disable tests that fail sporadically (#5192) 2017-01-03 11:06:51 -10:00
Livar Cunha
1f3356b330 Copying the nuget.config template for the publish web app test, so that the new tools packages can be resolved. 2016-12-28 22:03:18 -08:00
Livar Cunha
fa675cb5e5 Updating the migrated tools version to 1.0.0-msbuild3-final. 2016-12-28 21:26:31 -08:00
Livar Cunha
ad88058266 Stopped doing hoisting of transitive project dependencies and references. We also don't validate if a dependency exist, since migration strictly speaking does not need it. We move the project.json and the csproj will fail to build just like the project.json would. 2016-12-28 14:48:38 -08:00
Livar
b4ef34bc38 Merge pull request #5104 from livarcocc/update_sdks
Updating the projects files in the repo to use the SDK attribute.
2016-12-21 15:34:33 -08:00
Livar Cunha
64360cb08b Commenting out building solution step in migrate tests because we have an issue in the SDK for it. 2016-12-21 14:06:06 -08:00
jonsequitur
a145c7ae81 fix path length problem in test 2016-12-20 18:17:36 -08:00
Livar Cunha
3b081316ad Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones. 2016-12-20 16:38:04 -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
Jon Sequeira
35e3625d4b Merge branch 'rel/1.0.0' into make-migration-backup-folder-peer-of-project 2016-12-20 15:24:33 -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
jonsequitur
620e573f95 make migration backup folder a sibling of the project root 2016-12-20 14:35:52 -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
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
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
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
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
Jeff Kluge
2205a8577c Move project.lock.json during migration
Closes #4753
2016-11-23 09:46:36 -08:00
Piotr Puszkiewicz
d39ee4a463 add *.xproj.user to backup file types 2016-11-16 01:10:55 -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
Krzysztof Wicher
43df9a170d Fix 4655: Migrate errors are not getting put in formatted output (#4718)
* Fix 4655: Migrate errors are not getting put in formatted output

* Move test asset to NonRestoredTestProjects

* use group test asset manager: NonRestoredTestProjects
2016-11-15 09:39:58 -08:00
Krzysztof Wicher
9212605e89 binding redirects tests: Simplify and get ready for enabling (#4692)
* binding redirects tests: Simplify and get ready for enabling

* fix targets broken during cleanup

* fix non-windows build

* apply pr feedback: remove some not needed code

* remigrate BindingRedirects samples, add x64 to bind redir proj
2016-11-14 14:26:03 -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
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
Livar Cunha
9139c4006b Fixing full framework tests 2016-11-01 00:31:21 -07:00
Livar Cunha
be2ab211f1 Addressing code review comments. 2016-10-31 12:39:03 -07:00
Livar
5a621b53e2 Merge pull request #4540 from livarcocc/issue4492/migrateWeb
Issue4492/migrate web
2016-10-31 12:26:26 -07:00
Livar Cunha
c3b57f2e72 Changing the Sdk.Web version to match the current SDK version so that we can update them together. Also added the dotnet-web to the migrated tests. 2016-10-30 21:32:11 -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
22a5a15ba9 Merge pull request #4536 from krwq/outputNameIssue
Migrating project with OutputName
2016-10-28 20:55:18 -07:00
Livar Cunha
6c1dd226ec Fixing windows failure due to path length. 2016-10-28 19:03:03 -07:00
Livar Cunha
9cbc563b55 Fixing tests in Windows. 2016-10-28 18:19:42 -07:00
Bryan Thornbury
c9f9421b93 preserve whitespace 2016-10-28 18:19:39 -07:00
Krzysztof Wicher
e9e05006da Migrating project with OutputName 2016-10-28 17:27:42 -07:00
Livar Cunha
29bd1e12e6 Fixing a merge with a new test that I added. No more restore3, hooray. 2016-10-27 20:56:36 -07:00
Livar Cunha
83350434bc Adding a E2E test and a indirect dependency to TestAppDependencyGraph. 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
017fe529c1 Adding a E2E test for migrating an app with AssemblyInfo. 2016-10-26 15:13:39 -07:00
Livar
caf072daeb Merge pull request #4463 from brthor/brthor/imports
Turn on tests
2016-10-21 14:22:21 -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
Bryan Thornbury
16ff3734a3 fix the multi tfm test to not build net20 2016-10-20 15:33:47 -07:00
Bryan Thornbury
1c1f4c462f turn on multi tfm test 2016-10-20 15:19:35 -07:00
Bryan Thornbury
481aebd18a turn on the web test 2016-10-20 15:04:53 -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
Piotr Puszkiewicz
02a19aff56 dotnet-new csproj templates (#4382)
Make csproj templates first-class in dotnet-new.
2016-10-14 00:06:35 -07:00
Justin Goshi
70a8872f45 Address CR comments for the new migration tests
Changing the tests to also verify the error messages.
2016-10-11 11:19:04 -07:00
Justin Goshi
5016aea90c Add tests 2016-10-10 18:01:59 -07:00
Sridhar Periyasamy
c6064677db Address PR feedback 2016-10-05 17:58:42 -07:00
Sridhar Periyasamy
1d85c241b1 Add support to migrate folders specified in global.json 2016-10-05 16:27:17 -07:00
Sridhar Periyasamy
a396630576 Fix P2P migration
Fixes #4269 by deep cloning the MsbuildTemplateProject for each P2P reference. Add test which migrates and builds P2P references.
2016-10-05 16:25:28 -07:00
Bryan Thornbury
bf5404373f add signed verification test 2016-10-04 16:48:14 -07:00
Bryan Thornbury
46b16d2de0 fix signing migration 2016-10-04 16:06:45 -07:00
Bryan Thornbury
a078e8b845 dir 2016-10-04 10:13:01 -07:00
Bryan Thornbury
adff632929 green 2016-10-03 20:10:09 -07:00
Bryan Thornbury
bf45ab19ca PackageReference 2016-10-03 17:12:57 -07:00
Livar Cunha
4173d19b3c Pinning the SDK version for migrated apps. 2016-09-30 09:27:16 -07:00
Livar Cunha
29b197534c Updating to a new SDK and adding a work around to set project.lock.json for migrated projects. 2016-09-30 09:27:15 -07:00
Livar Cunha
7e16ad0388 Adding TargetFrameworks even for single TFM and cleaning up PackageRef. 2016-09-30 09:27:15 -07:00
Sridhar Periyasamy
a50708ac5c Address PR feedback 2016-09-28 09:00:15 -07:00
Sridhar Periyasamy
7ee2bd1f26 Add support to migrate a directory.
- Given a directory migrate all the project.jsons in it recursively.
- Remove '-p/--project' option. Instead directly pass a directory or project.json as argument.
- Add tests.
2016-09-26 14:16:17 -07:00
Sridhar Periyasamy
ec7aa87576 Add xproj tests to test migrate command. 2016-09-23 17:33:35 -07:00
Sridhar Periyasamy
46ab621422 Migrate P2P references
- Given a project migrate all the project references recursively.
- Add a boolean option '--skip-project-references' to skip migrating P2P references. By default P2P references are migrated.
- Remove the '--output' since it is not used heavily and makes migrating multiple projects easier.
- Add tests
2016-09-23 14:25:57 -07:00
Bryan Thornbury
a688885f21 remove nuget dependency in tests 2016-09-21 21:23:50 -07:00
Bryan Thornbury
362f71a94a Project Json mapping migration support 2016-09-20 21:18:11 -07:00
Bryan Thornbury
02495c07e0 Remove script extension inference test 2016-09-19 15:13:09 -07:00
Bryan Thornbury
448d9dc08b remove pathext workaround 2016-09-19 13:25:40 -07:00
Bryan Thornbury
67f292947d try again 2016-09-19 11:11:01 -07:00
Bryan Thornbury
2ddcbe449c kill script extension inference tests 2016-09-19 10:54:45 -07:00
Bryan Thornbury
9067bc9e45 Path ext hacks 2016-09-19 10:33:03 -07:00
Bryan Thornbury
3cdd994798 fix test 2016-09-15 16:30:39 -07:00
Bryan Thornbury
944eb1e787 Migration X-Targeting 2016-09-15 15:54:10 -07:00
Livar Cunha
236e0d57da Updating NuGet.Config for migration tests. 2016-09-06 13:58:16 -07:00
Livar Cunha
e0629ad351 Fixing test failure because the web app is using packages in a feed that we did not have. Add that feed through a NuGet.COnfig only for the tests that need it. 2016-09-02 17:59:13 -07:00
Livar Cunha
27bc1c4f91 Merge branch 'rel/1.0.0-preview2' into merge_preview2_to_rel100
* rel/1.0.0-preview2:
  Update versions of EF and scaffolding tools
  Update Kestrel to 1.0.1
  Update version of routing to 1.0.1
  Add missing comma to F# lib project.json
  Update cshtml wildcard in publishOptions
  Don't print arguments in F# console app
  Update F# dotnet-new templates for Preview 2 (Enrico Sada rebase)
  Update MVC version to 1.0.1
  Upgrade Corefx and coreclr references
  fix typo in dotnet-install file
  Remove the VS2012 CRT dependency from docs (#3632)
  Fix README to use hostfxr download links (#3622)
  Fix Oracle Linux version in README.md
  Use NugetCache Sentinel for Telemetry setting.
  Add Serviceable assembly attribute and nuspec attributes for all shipping CLI assemblies.
  Remove showing firsttime eula for non verbs.
  Adding Oracle Linux and Linux Mint to the titles
  Moving Ubuntu 16.04 to be next to Ubuntu 14.04
  Update README.md
2016-09-02 14:53:16 -07:00
Joel Verhagen
3619b7d767 Set the "hashPath" when building the .deps.json file
Update Microsoft.Extensions.DependencyModel to 1.0.1-beta-000933
Update Microsoft.DotNet.PlatformAbstraction to 1.0.1-beta-000933
Update NuGet to 3.6.0-beta.1.msbuild.4
Update dotnet-test-xunit to 1.0.0-rc2-350904-49
2016-09-02 10:02:54 -07:00
Eric Erhardt
94edeb44ca Fix tests that now pass correctly with the latest Sdk. 2016-09-01 13:42:35 -05:00
Eric Erhardt
0e4044b8bd Update Microsoft.NETCore.Sdk to 1.0.0-alpha-20160831-1 2016-09-01 11:08:34 -05:00
Bryan Thornbury
b0554d3ff3 PR Feedback 2016-08-30 12:00:56 -07:00