Commit graph

1341 commits

Author SHA1 Message Date
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Livar Cunha
151d2dca62 Disable migrate and publish web app with content because CI does not have NPM
Disabling new tests to unblock CI, they pass on local machine but fail in CI. Will investigate later.
2017-02-23 23:40:25 -08:00
Livar Cunha
a6165feec5 Adding an E2E test for pack with content during migration. 2017-02-23 23:07:38 -08:00
Livar
6d9137cf11 Merge branch 'rel/1.0.0' into migrate_content 2017-02-23 22:56:20 -08:00
Livar Cunha
8e35beccb8 Fixing a failing test and adding a few more E2E tests around binplace content for migrated projects. 2017-02-23 22:55:35 -08:00
Livar Cunha
733ee18c5a Updating publish, pack and build of content to use None with Never/false/Never in their metadata for excluded items. 2017-02-23 20:36:02 -08:00
Livar Cunha
f05bbd92a6 Intermediate commit to get a WIP PR out. This adds the None Update with CopyToOutputDirectory set to Never. 2017-02-23 18:47:17 -08:00
Livar Cunha
b660311772 Switching the CopyToOutput for build and publish and the file for pack to use None Update instead of include. Also, fixed the exclude patterns for web apps. 2017-02-23 18:47:17 -08:00
Livar Cunha
1228c7ef55 Do not migrate Content that is already included in the Web SDK for web apps. 2017-02-23 18:47:17 -08:00
Livar Cunha
14a7dd7ef1 Migrate now moves all file copies to the None element. 2017-02-23 18:47:17 -08:00
Livar Cunha
3bbfcb428b Adding merging of ProjectItemElement.Update. Before, we only merged Include. 2017-02-23 18:47:16 -08:00
Unknown
db2c5378cb Remove runtime specification in favor of implicit runtime 2017-02-23 17:57:32 -08:00
Eric Erhardt
ace9526681 Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'
Conflicts:
	README.md
	build/Microsoft.DotNet.Cli.Monikers.props
	test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
2017-02-23 15:42:35 -06:00
Livar Cunha
24431edfa3 Fixing the origin versions of BrowserLink to migrate. 2017-02-22 20:11:53 -08:00
Livar Cunha
ef49240f78 Fixing failing test. I changed the version but forgot to update the test. Should have fixed the test first. 2017-02-22 20:11:46 -08:00
Livar Cunha
3701b94c32 Updating the FTS versions of packages. Started uplifting FTS packages. And migration BrowserLink.Loader to BrowserLink. 2017-02-22 20:11:34 -08:00
Eric Erhardt
8aaffc2238 Fix tests on netcoreapp1.1 only platforms 2017-02-22 21:34:21 -06:00
Piotr Puszkiewicz
cb98421950 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateTemplatePackages 2017-02-22 13:23:16 -08:00
Mike Lorbetske
0a242633ca Use the curated feed with all the relevant ASP.NET packages 2017-02-22 11:29:34 -08:00
Mike Lorbetske
7b4c064756 Correct version of the MVC package being looked for in tests 2017-02-21 20:16:34 -08:00
Piotr Puszkiewicz
3457f0894e Merge branch 'rel/1.0.0' into dev/jgoshi/enableSolutionBuildTestsRel100 2017-02-21 20:02:20 -08:00
Mike Lorbetske
04f714c01f Test fixes - update AspNetCore version being looked for, account for diasymreadernative showing up in output, account for new default of netcoreapp1.1 for console apps 2017-02-21 19:48:24 -08:00
Mike Lorbetske
2659a777b5 Fix tests by updating the temporary asp.net feeds
Revert change to feed ordering for normal nuget.config
2017-02-21 18:40:11 -08:00
Mike Lorbetske
0aa4e83cb8 Reorder feeds to prevent issue where a package with the same name and version has been rebuilt
Update package versions in tests
2017-02-21 17:10:53 -08:00
Mike Lorbetske
e145ca88e4 Placeholder for template update 2017-02-21 16:28:47 -08:00
Satya Madala
74086bec31 Merge branch 'tp-20170217' of https://github.com/smadala/cli into tp-20170217 2017-02-18 23:08:42 +05:30
Satya Madala
67142bfd5d Set console-logger output to normal 2017-02-18 23:05:33 +05:30
Justin Goshi
aefdb22ae4 Shorten test folder name 2017-02-17 17:02:15 -08:00
Livar Cunha
b8a68ad2e0 No longer add runtime identifier when migrating apps that contain full framework and no runtime identifiers already. 2017-02-17 11:30:20 -08:00
Justin Goshi
aaa9fe2c1d Re-enable solution building tests 2017-02-17 11:13:33 -08:00
Livar
47c16b271e Merge branch 'rel/1.0.0' into ignore_case_tools 2017-02-15 15:35:53 -08:00
Livar
d1a844da2c Merge branch 'rel/1.0.0' into dev/jgoshi/dotnetAddDefaultProjectTypeGuid 2017-02-15 14:10:10 -08:00
Livar Cunha
8d38a2a67f Making the tool name comparison with the package case insensitive, so that tools are not required to be declared with the exact casing as the packages that contain them. 2017-02-15 11:33:59 -08:00
Justin Goshi
149a4590b5 Do not add duplicate projects (#5698) 2017-02-14 15:47:06 -08:00
Justin Goshi
4d24ae06bb Default to C# project type guid 2017-02-14 14:57:04 -08:00
Livar Cunha
54464dda36 Updating the version test to check that dotnet --version uses the .version file instead of using a regular expression to validate the printed version. 2017-02-14 10:32:11 -08:00
Livar
6ef4bdf4e2 Merge branch 'rel/1.0.0' into new_shared_framework_versions 2017-02-13 13:44:57 -08:00
Livar Cunha
02c70abe49 Updating the version of the ASP.NET packages that we migrate to, to the RTM package versions. 2017-02-12 22:09:44 -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 Goshi
5e3f368338 Update the test 2017-02-08 14:26:14 -08:00
Justin Goshi
50c10decf5 Migrate compilationOptions 2017-02-08 00:20:04 -08:00
jonsequitur
182c695275 throw CommandParsingException rather than crash on missing single value 2017-02-03 10:57:57 -08: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
jonsequitur
667f1cf018 also escape :// 2017-02-01 14:13:07 -08:00
jonsequitur
2ea3af799d escape semicolons when forwarding RestoreSources to MSBuild 2017-02-01 14:13:07 -08:00
Livar
1af25e0fd9 Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 14:07:57 -08:00
Justin Goshi
3e07297525 Migration: Remove System.GC.Server from runtimeconfig.template.json and inject ServerGarbageCollection property into the csproj (#5537)
* Remove runtimeconfig.template.json from templates

* Inject ServerGarbageCollection property
2017-02-01 14:05:53 -08:00
Livar Cunha
49ae86d09f Fixing new test to work crossplat by calculating path with Path.Combine 2017-02-01 10:33:53 -08:00