Justin Goshi
1b318510b2
Add back last empty line in BranchInfo.props
2017-02-24 10:36:07 -08:00
Justin Goshi
8279c16fa4
Merge branch 'master' into dev/jgoshi/removeGlobalProps
2017-02-24 10:34:23 -08:00
Justin Goshi
5bb7ca8112
Add back BranchInfo.props
2017-02-24 10:34:16 -08:00
Piotr Puszkiewicz
e2dcac0e4b
Merge branch 'rel/1.0.1' into FixUbuntu1610
2017-02-24 01:22:49 -08:00
Unknown
3dc266f21c
Remove RID from test package creation
2017-02-24 00:57:15 -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
16d1fe4c28
Merge branch 'rel/1.0.0' into update_sdk
2017-02-23 19:49:36 -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
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
Justin Goshi
74e343e111
First pass at cleaning up the global properties files
2017-02-23 17:07:26 -08: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
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
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
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
49dd6bcd7c
Remove corehost from CLI layout
2017-02-23 01:36:43 -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
1199df1c05
Move tool deps file creation into redist.csproj
2017-02-22 22:47:11 -08:00
Piotr Puszkiewicz
dc1b97c4a1
Merge pull request #5806 from piotrpMSFT/piotrpMSFT/infra/HackFilesToCopy
...
remove HackFilesToCopy
2017-02-22 20:16:51 -08:00
Piotr Puszkiewicz
10750eb136
Merge pull request #5807 from piotrpMSFT/piotrpMSFT/infra/RoslynStaticPublish
...
Enable Publishing Roslyn with Static Output Path
2017-02-22 20:16:25 -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
Piotr Puszkiewicz
b9378b8a66
Merge pull request #5803 from dotnet/dev/jgoshi/refactorPublishDir
...
Refactor props from publish directory
2017-02-22 17:49:08 -08:00
Piotr Puszkiewicz
31f2410b4f
Enable Publishing Roslyn with Static Output Path
2017-02-22 17:33:26 -08:00
Piotr Puszkiewicz
4d0dbdbb7f
Cleanup
2017-02-22 17:05:49 -08:00
Piotr Puszkiewicz
1ed6c2cdac
Fix spacing
2017-02-22 17:01:14 -08:00
Piotr Puszkiewicz
5a89b01459
Remove HackFilesToCopy
2017-02-22 16:57:32 -08:00
Piotr Puszkiewicz
84ead82037
RootProject property
2017-02-22 16:57:10 -08:00
Justin Goshi
8b2933839c
Merge
2017-02-22 16:56:34 -08:00
Justin Goshi
e894d7e60e
Refactor publish.target
2017-02-22 16:54:15 -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
4105138019
Merge branch 'rel/1.0.0' into tp-20170222-09
2017-02-22 16:33:51 -08:00
Justin Goshi
1f39e07909
Refactor props from publish directory
2017-02-22 16:19:56 -08:00
Unknown
1c9f2e9b83
ProjectsToPublish
2017-02-22 15:33:55 -08:00
Piotr Puszkiewicz
5be3a70121
RootProject property
2017-02-22 15:31:55 -08:00
Piotr Puszkiewicz
3c8477ad1b
Merge branch 'rel/1.0.0' into piotrpMSFT/issues/brandingUpdate100
2017-02-22 15:23:15 -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
Justin Goshi
13dbdd1a4e
Merge
2017-02-22 13:38:39 -08:00
