Commit graph

4526 commits

Author SHA1 Message Date
Livar Cunha
8c2e7c9f01 Merge branch 'rel/1.0.0-rc3' into merge_rc3
* rel/1.0.0-rc3:
  Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped.
  Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
  Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list.
  Adding a few more packages that were not in the manifest and moving some tests around.
  Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one.
  Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift.
  Migration: do not inject built in compile includes that the SDK does
  Update msbuild to 15.1.0-preview-000522-02
  Migration: Do not add RIDs for Library projects (#5279)
  Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses.
  Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-13 14:08:31 -08:00
Justin Goshi
f972cf80a9 Treat /? the same as --help (#5285)
* Fixes issue 4539

* Support -?
2017-01-13 01:24:12 -08:00
Livar
c868faf034 Merge pull request #5302 from livarcocc/fix_migration_dropping_dependencies
Fixing an issue where packages with a filter but no match were being dropped
2017-01-12 20:06:52 -08:00
Livar
be9134f512 Merge pull request #5298 from krwq/i5297
fix stack trace for unhandled exceptions in dotnet-migrate
2017-01-12 19:46:10 -08:00
Livar Cunha
18a3dd60b5 Fixing an issue where packages with a filter but no match were not being migrated as is, instead they were being dropped. 2017-01-12 18:23:35 -08:00
Krzysztof Wicher
22e85c2f77 fix stack trace for unhandled exceptions in dotnet-migrate 2017-01-12 16:08:54 -08:00
Krzysztof Wicher
5fea7c3ae6 Remove try catches choking all exceptions (#5206)
* remove some try catches choking all exceptions

* rename ExceptionExtension to ReportAsWarning, show full stack instead of just message

* dotnet-migrate try catch clean-up

* fix migration test failures
2017-01-12 15:42:36 -08:00
Livar
a9c5f4e90a Merge pull request #5293 from dotnet/dev/jgoshi/issue5253
Migration: do not inject built in compile includes that the SDK does
2017-01-12 15:00:03 -08:00
Livar
417b208f43 Merge pull request #5286 from dotnet/prkrishn/migrate-viewcompilation
Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation
2017-01-12 14:59:27 -08:00
Pranav K
80c435e6a1 Add support for migrating Microsoft.AspNetCore.Mvc.ViewCompilation 2017-01-12 13:49:28 -08:00
Livar
c9216f93ef Merge pull request #5288 from livarcocc/migrate_1_1_0_asp_dependencies
Migrate  1.1.0 asp dependencies and move dependencies to LTS
2017-01-12 13:16:18 -08:00
Livar
a442449c55 Updating the branding on rel/1.0.0 to rc4. (#5267) 2017-01-12 13:14:57 -08:00
Piotr Puszkiewicz
97d4c8b24f Merge branch 'rel/1.0.0-rc3' into dev/jgoshi/issue5253 2017-01-12 11:47:46 -08:00
Livar Cunha
deb50a3cc7 Switching to using a csv as the source of our lts packages. Also, this is a more comprehensive list. 2017-01-12 11:38:05 -08:00
Livar Cunha
12abcf7208 Adding a few more packages that were not in the manifest and moving some tests around. 2017-01-12 11:38:05 -08:00
Livar Cunha
a0aa8150de Migrating packages to LTS (1.0.3) versions if they have a smaller version than the LTS one. 2017-01-12 11:38:05 -08:00
Livar Cunha
89fba856e8 Adding ranges to the source mappings so that we can specify the origin should match this range and migrate to that version. We use this to handle LTS/FTS migration and will use that for the LTS uplift. 2017-01-12 11:38:05 -08:00
Justin Goshi
71da7f6a45 Migration: do not inject built in compile includes that the SDK does 2017-01-12 11:22:41 -08:00
Piotr Puszkiewicz
4319668111 Merge pull request #5291 from piotrpMSFT/piotrpMSFT/issues/5283-UpdateMsbuild
Update msbuild to 15.1.0-preview-000522-02
2017-01-12 01:29:34 -08:00
Piotr Puszkiewicz
7608f2d288 Update msbuild to 15.1.0-preview-000522-02 2017-01-11 23:58:51 -08:00
Piotr Puszkiewicz
84c19668d3 Merge pull request #5282 from piotrpMSFT/piotrpMSFT/merge/rc3toRTM
Merge RC3 into rel/1.0.0
2017-01-11 22:39:44 -08:00
Livar
e734d5c15c Merge pull request #5270 from livarcocc/fix_lzma
Cherry pick the lzma fix from rel/1.0.0 into rel/1.0.0-rc3
2017-01-11 19:18:15 -08:00
Piotr Puszkiewicz
0f9888c11d Merge branch 'rel/1.0.0' into piotrpMSFT/merge/rc3toRTM 2017-01-11 17:15:44 -08:00
Krzysztof Wicher
c9b873caad make dotnet-build show build summary (#5277)
* make dotnet-build show build summary

* Fix race in some dotnet-migrate (sln) tests
2017-01-11 17:06:03 -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 Cunha
420a6e9a66 Use a separate env variable to control uploading the lzma archive. We only want OSX to publish the archive, because turns out that windows published archives are not used by unix based oses. 2017-01-11 14:45:25 -08:00
Eric Erhardt
408b36f509 Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-11 14:45:24 -08:00
PiotrP
c008e85f6a revert rc3->preview5 2017-01-11 13:18:44 -08:00
PiotrP
9008aaff85 merge RC3 into rel/1.0.0 2017-01-11 13:03:09 -08:00
Piotr Puszkiewicz
0bd6303f47 Restore debian test before running it (#5272) 2017-01-11 10:53:26 -08:00
Eric Erhardt
218ec5a5cf Merge pull request #5256 from eerhardt/NuGetDependencyVersions
Add NuGet version to DependencyVersions.props.
2017-01-11 08:16:40 -06:00
Livar
4b82852d56 Updating the version of msbuild to 15.1.0-preview-000516-03 (#5266)
* Updating the version of msbuild to 15.1.0-preview-000516-03

* Remove test that assumes props/targets imports

The test ItAddsRefBetweenImports validated that the MSBuild XML model contained new project references between the props and targets imports. While useful be fore the SDK attribute, the test no longer adds value since the SDK is added implicitly, guaranteeing it wraps the remaining project contents.

* Move MSBuild to 15.1.0-preview-000509-03

This is the last msbuild version prior to the change of MSBuild's dependencies to include .NET 1.1 components.

* Move MSBuild invocations to use dirs.props/dirs.tasks

* Put back the test targets. We'll unify later.

* Remove dirs.props props from templates msbuild invocation
2017-01-11 01:49:22 -08:00
Piotr Puszkiewicz
203a28beb7 Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-11 00:43:07 -08:00
Mike Lorbetske
ad6fab0a15 Synchronize templates with new3, add global.json (#5244)
* Synchronize templates with new3, add global.json

* Add runtimeconfig.template.json for web

Removes global.json write during template creation

* Remove global.json check from the test

* making templates the same as new3 templates

* Fix broken PrivateAssets, content update

Sets OutputType as appropriate
Alphabetizes package references

* Rollback browserlink version to 1.0.0

* Downgrade 1.1.0 of browserlink to 1.0.0 as well

* Add newline to the end of the console project
2017-01-10 22:58:30 -08:00
Eric Erhardt
4d3e2872fe Merge pull request #5269 from eerhardt/FixDownloadArchive
Fix the download of the LZMA archive on dev machines and in Jenkins CI.
2017-01-10 22:11:59 -06:00
Eric Erhardt
9d2976863b Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 21:59:30 -06:00
Eric Erhardt
fd8f9b1bde Fix the download of the LZMA archive on dev machines and in Jenkins CI. 2017-01-10 21:10:40 -06:00
Livar
8f3e00f620 Merge pull request #5260 from dotnet/updatenugetrc3
update nuget rc3 dependencies and update sdk
2017-01-10 18:17:09 -08:00
Krzysztof Wicher
0be2f7c1fa update msbuild version to 15.1.0-preview-000509-03 (#5249) 2017-01-10 17:46:05 -08:00
Rohit Agrawal
00425c3d34 Update Microsoft.DotNet.Cli.DependencyVersions.props 2017-01-10 16:46:32 -08:00
Livar
16e87076a6 Merge branch 'rel/1.0.0-rc3' into updatenugetrc3 2017-01-10 16:08:49 -08:00
Livar
839810a390 Merge pull request #5250 from livarcocc/update_brand_to_rc3
Updating the branding of the CLI to 1.0.0-rc3
2017-01-10 15:36:22 -08:00
Livar Cunha
daba5cf499 Updating additional values of branchinfo.txt. 2017-01-10 14:16:15 -08:00
Livar Cunha
8a6faa2dca Fixing windows test. 2017-01-10 14:12:04 -08:00
Eric Erhardt
635c0a192a Merge branch 'rel/1.0.0' into NuGetDependencyVersions 2017-01-10 15:35:25 -06:00
Eric Erhardt
719e5cc611 Merge pull request #5258 from eerhardt/FixRel10
Fixing build break with latest NuGet packages.
2017-01-10 15:33:00 -06:00
Eric Erhardt
6f506b331c Fixing build break with latest NuGet packages. 2017-01-10 13:46:26 -06:00
Eric Erhardt
465655c85a Revert "Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0"
This reverts commit 4e951a480b, reversing
changes made to 006fd49e5c.
2017-01-10 13:36:40 -06:00
Rohit Agrawal (NUGET)
3ecdc62089 update nuget rc3 dependencies and update sdk 2017-01-10 11:24:27 -08:00
seancpeters
4e951a480b Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into rel/1.0.0 2017-01-10 10:50:40 -08:00