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
Piotr Puszkiewicz
22fcc35797
Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage
...
Refactor props in package directory
2017-02-23 18:15:52 -08:00
Unknown
db2c5378cb
Remove runtime specification in favor of implicit runtime
2017-02-23 17:57:32 -08:00
Justin Goshi
74e343e111
First pass at cleaning up the global properties files
2017-02-23 17:07:26 -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
Matt Ellis
0f092f92c2
Don't look for Debian package dependencies when skipping installers
...
Today, we always check to see if DebianPackageBuildDependencies are
present on the machine doing a build, because we will need them to
build the .deb files later on.
Since we now allow skipping of building packages, don't check for
these dependencies if we weren't going to use them.
2017-02-23 14:11:11 -08:00
Piotr Puszkiewicz
f5f6adccb0
Merge pull request #5797 from krwq/2017-02-17-clean-up-cli-utils
...
Add unit tests around command line parsing
2017-02-23 14:07:28 -08:00
Justin Goshi
0ec5003d68
Forgot Installer.PKG.targets
2017-02-23 13:59:20 -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
Justin Goshi
d9e532a53d
Fix the build break
2017-02-23 13:30:04 -08: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
Justin Goshi
43cf7be593
Try to fix the build break
2017-02-23 13:11:25 -08:00
Piotr Puszkiewicz
55b81e8a23
Merge pull request #5814 from piotrpMSFT/piotrpmsft/infra/removeCoreHost
...
Remove corehost from CLI layout
2017-02-23 12:40:21 -08:00
Justin Goshi
84e8b8580d
Try the rename of the LayoutOutput directory
2017-02-23 12:28:57 -08:00
Justin Goshi
b86afddbd3
Try reverting Installer.DEB.targets to investigate the build break
2017-02-23 12:03:17 -08:00
Krzysztof Wicher
3a3025b3af
remove duplication in dotnet-restore
2017-02-23 11:31:48 -08:00
Krzysztof Wicher
c75d2e446e
reduce some repetition
2017-02-23 11:24:36 -08:00
Satya Madala
4c44e29ea0
TestPlatform branding changes: 15.0.0
2017-02-24 00:18:10 +05:30
Justin Goshi
2118c643d6
Refactor props in package directory
2017-02-23 10:37:48 -08:00
Piotr Puszkiewicz
9e4beca874
Merge pull request #5804 from dotnet/dev/jgoshi/refactorPublishTarget
...
Refactor publish.target
2017-02-23 10:13:47 -08:00
Justin Goshi
acc77e2a46
Address pr comments
2017-02-23 09:26:14 -08:00
Piotr Puszkiewicz
99da46517e
Merge pull request #5817 from piotrpMSFT/piotrpMSFT/infra/RedistPublishVersion
...
Generate Version file before redist publish
2017-02-23 09:21:33 -08:00
Justin Goshi
08ffc78be6
Merge branch 'master' into dev/jgoshi/refactorPublishTarget
2017-02-23 09:01:44 -08:00
Piotr Puszkiewicz
56f9a84dfd
Generate Version file before redist publish
2017-02-23 02:33:00 -08:00
Piotr Puszkiewicz
ab7cbab3bf
Merge pull request #5812 from piotrpMSFT/piotrpMSFT/infra/redistPublishFx
...
Move copying sharedfx to before publish of redist
2017-02-23 02:14:18 -08:00
Piotr Puszkiewicz
49dd6bcd7c
Remove corehost from CLI layout
2017-02-23 01:36:43 -08:00
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
7818348fc2
Move copying sharedfx to before publish of redist
2017-02-23 01:12:32 -08:00
Piotr Puszkiewicz
27f89d6b7b
Merge pull request #5809 from piotrpMSFT/piotrp/Infra/DepsCreation
...
Move tool deps file creation into redist.csproj
2017-02-23 00:04:24 -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
Piotr Puszkiewicz
1199df1c05
Move tool deps file creation into redist.csproj
2017-02-22 22:47:11 -08:00