Commit graph

5098 commits

Author SHA1 Message Date
Piotr Puszkiewicz
e92f9dfe0d Bump to 2.0.0-rc5-61427-04 2017-02-27 15:07:54 -08:00
Piotr Puszkiewicz
79704cc074 Merge branch 'rel/1.0.1' into piotrpMSFT/bump/Roslyn 2017-02-27 13:15:06 -08:00
Piotr Puszkiewicz
8d38b10992 Merge pull request #5860 from piotrpMSFT/piotrpMSFT/issues/doublebranding
Remove duplicate installer suffix
2017-02-27 13:13:50 -08:00
Piotr Puszkiewicz
fae584ed59 Merge pull request #5852 from richlander/3pn
Add license text to LZMA SDK license notice
2017-02-27 10:24:10 -08:00
Piotr Puszkiewicz
b55b5ad033 Remove duplicate installer suffix 2017-02-27 10:21:42 -08:00
Richard Lander
a46f6fe807 Add license text to LZMA SDK license notice 2017-02-26 12:11:05 -08:00
Eric Erhardt
0fff8009c1 Merge pull request #5848 from eerhardt/Merge100
Merge rel/1.0.0 to rel/1.0.1
2017-02-25 21:30:28 -06:00
Eric Erhardt
ab887ec024 Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101 2017-02-25 14:30:53 -06:00
Eric Erhardt
23392fa3c3 Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-25 13:12:35 -06:00
Livar
e53429feb4 Merge pull request #5841 from livarcocc/update_platform_abstractions_103
Updating the SDK to 1.0.0-alpha-20170224-6
2017-02-24 23:52:09 -08:00
Livar Cunha
9210b84a98 Updating the SDK to 1.0.0-alpha-20170224-6 2017-02-24 15:56:59 -08:00
Livar Cunha
b3da712d3d Updating both platform abstractions and dependency model to 1.0.3. 2017-02-24 14:52:05 -08:00
Eric Erhardt
aa3c38e7e1 Merge pull request #5839 from eerhardt/Update101Readme
Update 1.0.1 README and Stage0
2017-02-24 16:26:36 -06:00
Piotr Puszkiewicz
fce8b417db Merge branch 'rel/1.0.0' into piotrpMSFT/bump/Roslyn 2017-02-24 14:13:14 -08:00
Piotr Puszkiewicz
cb66a1d224 Merge pull request #5838 from eerhardt/Update100Readme
Update rel/1.0.0 README with master's format
2017-02-24 14:12:58 -08:00
Unknown
66be1db3fe Bump Roslyn to 2.0.0-rc5-61424-02 2017-02-24 14:11:35 -08:00
Eric Erhardt
5fcd685433 Update Stage0 to use the latest build. 2017-02-24 15:13:36 -06:00
Eric Erhardt
214adbe859 Update README with new distros.
Also take the formating from master and rel/1.0.0 for builds and installer links.
2017-02-24 15:09:40 -06:00
Eric Erhardt
0284cba4f0 Back porting #5597 into rel/1.0.0
Update the daily build table to be more maintainable and remove the links to runtime installers.

Adding link to Ubuntu 16.04 deb installer.
2017-02-24 13:37:33 -06:00
Eric Erhardt
119d7518ba Merge pull request #5833 from dotnet/FixUbuntu1610
Fix debian_config.json on ubuntu16.10
2017-02-24 08:48:04 -06:00
Piotr Puszkiewicz
8986198501 Merge pull request #5831 from livarcocc/migrate_content
[WIP] Migrate content
2017-02-24 02:23:10 -08:00
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