Commit graph

5027 commits

Author SHA1 Message Date
Piotr Puszkiewicz
e2dcac0e4b Merge branch 'rel/1.0.1' into FixUbuntu1610 2017-02-24 01:22:49 -08:00
Livar
480f2dd377 Fixing the exclude pattern used by the Migration to exclude WEB SDK globs. 2017-02-24 01:12:35 -08:00
Unknown
3dc266f21c Remove RID from test package creation 2017-02-24 00:57:15 -08: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
ca4d0b8fbb Merge pull request #5813 from livarcocc/update_sdk
Adding the SDK version to the hash of the lzma archive and update SDK version
2017-02-23 21:42:00 -08:00
Eric Erhardt
a7003763b7 Fix debian_config.json on ubuntu16.10
When we only have a single shared framework, the python json parser throws an error since there is a hanging comma on the last property.

Fixing this by removing the comma when there is only a single Shared Framework dependency.
2017-02-23 23:25:26 -06: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
Eric Erhardt
51714c40d4 Merge pull request #5824 from eerhardt/Merge100To101
Merge 1.0.0 to 1.0.1
2017-02-23 21:53:45 -06:00
Livar
16d1fe4c28 Merge branch 'rel/1.0.0' into update_sdk 2017-02-23 19:49:36 -08:00
Livar
88a8aa7100 Merge pull request #5821 from smadala/tp-insert-15.0.0
TestPlatform branding changes: 15.0.0
2017-02-23 19:49:21 -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
Piotr Puszkiewicz
781326a0ad Merge branch 'rel/1.0.0' into tp-insert-15.0.0 2017-02-23 18:40:58 -08:00
Piotr Puszkiewicz
55d5d98332 Merge pull request #5826 from mlorbetske/dev/mlorbe/AbsorbTestSDKUpdate
Template update for test SDK version change
2017-02-23 18:40:34 -08:00
Piotr Puszkiewicz
8fc6766785 Merge branch 'rel/1.0.1' into Merge100To101 2017-02-23 18:22:02 -08:00
Unknown
db2c5378cb Remove runtime specification in favor of implicit runtime 2017-02-23 17:57:32 -08:00
Eric Erhardt
6f6ae43a93 Merge pull request #5823 from eerhardt/Add11Platforms_101
Fix Ubuntu16.10 BuildSdkDeb
2017-02-23 17:02:52 -06:00
Mike Lorbetske
d9d5bb10cb Template update for test SDK version change 2017-02-23 14:13:27 -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
Eric Erhardt
5227896d0f Fix Ubuntu16.10 BuildSdkDeb
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
2017-02-23 15:29:11 -06:00
Satya Madala
4c44e29ea0 TestPlatform branding changes: 15.0.0 2017-02-24 00:18:10 +05:30
Livar
10240c452b Merge branch 'rel/1.0.0' into update_sdk 2017-02-23 01:15:40 -08:00
Livar Cunha
7f4f35db65 Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change. 2017-02-23 01:13:58 -08:00
Piotr Puszkiewicz
fa2c9e025c Merge pull request #5810 from dotnet/piotrpMSFT-patch-1
yolo
2017-02-23 00:04:00 -08:00
Piotr Puszkiewicz
fb82fb6a8e Update README.md 2017-02-23 00:02:33 -08:00
Livar
ead36caee1 Merge pull request #5808 from livarcocc/update_migrate_packages
Update packages used by migration to 1.0.4 and 1.1.1
2017-02-22 21:35:16 -08:00
Piotr Puszkiewicz
31742376ef Merge pull request #5800 from eerhardt/Add11Platforms_101
Add Fedora24, OpenSUSE42, and Ubuntu 16.10
2017-02-22 21:17:48 -08: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
281bd15a19 Fixing a couple of stray package versions. 2017-02-22 20:11:40 -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
Livar Cunha
523935f3fe Updating packages for migration to new LTS versions. 2017-02-22 20:11:19 -08:00
Eric Erhardt
7036fa1aef Update dotnet-deb-tool-consumer to use the latest dotnet-deb-tool.
The latest deb-tool will use the CLI's runtime, which is required on distros that don't have .NET Core 1.0 installed.
2017-02-22 21:34:22 -06:00
Eric Erhardt
8aaffc2238 Fix tests on netcoreapp1.1 only platforms 2017-02-22 21:34:21 -06:00
Piotr Puszkiewicz
bb49591e81 Merge pull request #5794 from codito/tp-20170222-09
Update TestPlatform to v15.0.0-preview-20170222-09.
2017-02-22 17:46:28 -08:00
Piotr Puszkiewicz
509cd0addb Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:47:08 -08:00
Piotr Puszkiewicz
187d48e2fe Merge pull request #5786 from piotrpMSFT/piotrpMSFT/issues/brandingUpdate100
Update CLI branding
2017-02-22 16:46:24 -08:00
Piotr Puszkiewicz
4105138019 Merge branch 'rel/1.0.0' into tp-20170222-09 2017-02-22 16:33:51 -08:00
Piotr Puszkiewicz
3c8477ad1b Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100 2017-02-22 15:23:15 -08:00
Piotr Puszkiewicz
0074f4718b Merge pull request #5787 from mlorbetske/dev/mlorbe/UpdateTemplatePackages
Template update for 1.0.4/1.1.1
2017-02-22 15:22:56 -08:00
Piotr Puszkiewicz
7d19c62679 Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100 2017-02-22 14:40:32 -08:00
Mike Lorbetske
6a26c5584a Pick up a newer version of templates carrying the latest test SDK changes 2017-02-22 14:04:17 -08:00
Piotr Puszkiewicz
cb98421950 Merge branch 'rel/1.0.0' into dev/mlorbe/UpdateTemplatePackages 2017-02-22 13:23:16 -08:00
Eric Erhardt
996d458e30 Support Ubuntu16.10 installer
Since Ubuntu16.10 doesn't have a 1.0 shared framework, only install the 1.1 shared framework.
2017-02-22 15:18:45 -06:00