Commit graph

5162 commits

Author SHA1 Message Date
Piotr Puszkiewicz
5d193e8b39 Merge conflicts 2017-02-27 17:13:13 -08:00
Piotr Puszkiewicz
981db5f817 Wip 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
69f5ecbeea Remove targets from deps file 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
b1787426c0 Also move nupkg contentFiles 2017-02-27 17:11:37 -08:00
Piotr Puszkiewicz
43266d2d9a Move publishing static MSBuildExtensions to redist.csproj 2017-02-27 17:11:03 -08:00
Piotr Puszkiewicz
7ea5bf478e Merge pull request #5861 from dotnet/dev/jgoshi/removeDuplicateProps
Remove duplicate properties
2017-02-27 16:40:31 -08:00
Eric Erhardt
ad9b62a400 Merge pull request #5862 from dotnet/UpdateNuGet
Update NuGet version with latest netstandard2.0 build
2017-02-27 17:34:25 -06:00
Eric Erhardt
c66d3bb6ad Update NuGet version with latest netstandard2.0 build 2017-02-27 14:50:39 -06:00
Piotr Puszkiewicz
182ecc69ac Merge pull request #5832 from dotnet/MultiProcTestBuild
Remove workaround for multi-proc builds
2017-02-27 12:27:45 -08:00
Justin Goshi
61c1e3e104 Remove duplicate properties 2017-02-27 11:06:44 -08:00
Piotr Puszkiewicz
0a6deabcce Enable multi-proc build of test sln. 2017-02-27 10:34:59 -08:00
Piotr Puszkiewicz
84bf23fe7d Merge pull request #5828 from dotnet/dev/jgoshi/removeGlobalProps
First pass at cleaning up the global properties files
2017-02-27 09:56:54 -08:00
Livar
d338c5b5fd Merge pull request #5850 from am11/master
Prefer Unix Shell build-in 'hash' over 'which'
2017-02-26 13:24:13 -08:00
Adeel
ba72ff0edd Prefer Unix Shell build-in 'hash' over 'which'
`which` is an external utility. `hash` or `command -v` are built-in
General Commands.

See http://stackoverflow.com/a/677212/863980

I chose `hash` here as `run-build.sh` is already using it.
2017-02-26 01:24:04 +02:00
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
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
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
Justin Goshi
d9e532a53d Fix the build break 2017-02-23 13:30:04 -08: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
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
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
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
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
Krzysztof Wicher
de7587782e remove dotnet test unit test stub 2017-02-22 17:41:20 -08:00
Krzysztof Wicher
eddca32b2f add dotnet clean unit tests 2017-02-22 17:40:02 -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
b81a00cfe3 add back Roslyn tasks 2017-02-22 17:01:14 -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