Commit graph

5385 commits

Author SHA1 Message Date
dotnet-bot
e246be9f64 Update CoreSetup to beta-001697 2017-03-08 20:31:52 +00:00
Justin Goshi
45a1e9e56c Allow host info passed in from the command line to override machine settings (#5904)
* Allow host info passed in from the command line to override machine settings

* Simplify the logic

* Address PR comments to keep a separate HostRid and HostOSName that are static

* Rename to BuildInfo.props

* Address PR comments

* Fix the previous merge

* Fix spacing

* Address PR comments
2017-03-08 09:10:53 -10:00
Livar
22816d7958 Merge pull request #5945 from piotrpMSFT/piotrpMSFT/infra/00prefix
Fix RHEL builds
2017-03-08 08:36:11 -08:00
Livar
c2db6d8ca4 Merge pull request #5950 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001689 (master)
2017-03-08 08:35:53 -08:00
dotnet-bot
dba212b21b Update CoreSetup to beta-001689 2017-03-08 15:53:17 +00:00
Livar
8df1812e7b Merge pull request #5946 from dotnet/update-sdk
Update .NET SDK
2017-03-07 20:42:18 -08:00
Daniel Plaisted
53d837bfdb Use Stage 2 dotnet in ArgumentForwardingTests 2017-03-07 17:44:12 -08:00
Eric Erhardt
f4090e2438 Merge pull request #5939 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001683 (master)
2017-03-07 18:55:10 -06:00
Daniel Plaisted
abdbc6f274 Restore package with crossgen 2017-03-07 16:01:53 -08:00
Eric Erhardt
f0e156d384 Merge pull request #5942 from ramarag/mult_Ver
Cache accepting multiple input files
2017-03-07 17:44:23 -06:00
Rama Krishnan Raghupathy
e40435920d tests for cache taking multiple input files 2017-03-07 14:38:12 -08:00
Rama Krishnan Raghupathy
ed1ca04f51 Enabling multifile support for cache 2017-03-07 14:38:07 -08:00
Daniel Plaisted
b0891781cb Update .NET SDK 2017-03-07 13:38:00 -08:00
Unknown
66d707b48d Bad Rebase 2017-03-07 13:23:48 -08:00
Unknown
bd97d02937 Fix RHEL issue 2017-03-07 13:22:42 -08:00
Piotr Puszkiewicz
b80ce431ca Merge pull request #5944 from piotrpMSFT/piotrpMSFT/infra/00prefix
Re-introduce 00 prefix
2017-03-07 13:21:33 -08:00
Unknown
d313cb4012 Change suffix to preview1 2017-03-07 12:05:42 -08:00
Unknown
eaa5049859 Force string comparison 2017-03-07 12:02:47 -08:00
dotnet-bot
0f4c77dbbd Update CoreSetup to beta-001683 2017-03-07 19:48:43 +00:00
Unknown
97e3767bd7 use PadLeft 2017-03-07 11:04:18 -08:00
Unknown
06ab197be5 Add back 000000 padding to commit count 2017-03-07 10:49:28 -08:00
Livar
ea15463bd5 Merge pull request #5941 from livarcocc/merge_cleanup
Replacing hard coded references to shared framework version.
2017-03-07 10:03:31 -08:00
Livar Cunha
03edcf6cfd Replacing dir.props with testassets.props for other test asset test projects. 2017-03-07 08:35:13 -08:00
Livar Cunha
ab28591c10 Replacing hard coded references to shared framework version. 2017-03-06 21:25:42 -08:00
Eric Erhardt
2048940760 Merge pull request #5933 from eerhardt/FixVersionsRepoUpdater
Fix UpdateVersionsRepo to pass file paths instead of a directory
2017-03-06 12:22:01 -06:00
Eric Erhardt
7e1a2fac9a Merge pull request #5932 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001675 (master)
2017-03-06 11:23:00 -06:00
Eric Erhardt
21080fc5be Fix UpdateVersionsRepo to pass file paths instead of a directory 2017-03-06 11:22:28 -06:00
dotnet-bot
44b6bbdba3 Update CoreSetup to beta-001675 2017-03-06 16:52:17 +00:00
Rich Lander
489cd753a5 Re-license as MIT (#5925) 2017-03-05 17:33:16 -08:00
Livar
b42697ff09 Merge pull request #5917 from eerhardt/FixVersionsRepoUpdater
Fix UpdateVersionsRepo to always write the files correctly.
2017-03-03 20:31:05 -08:00
Livar
04d2501272 Merge pull request #5915 from ravimeda/master
Remove BuildPipeline definitions.
2017-03-03 20:30:55 -08:00
Eric Erhardt
0819949172 Merge pull request #5717 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to beta-001663 (master)
2017-03-03 22:13:02 -06:00
Eric Erhardt
21471aa956 Fix UpdateVersionsRepo to always write the files correctly.
We were only building nupkgs on windows, which meant if a non-windows machine was the last leg to finish, we were writing a blank file to the versions repo.

Fix #4399
2017-03-03 21:43:38 -06:00
dotnet-bot
74defebb5a Update CoreSetup to beta-001663 2017-03-04 03:34:35 +00:00
Eric Erhardt
0e0b59f910 Merge pull request #5909 from dotnet/UpdateSDK
Update NET.Sdk to 1.1.0-alpha-20170303-2
2017-03-03 19:56:16 -06:00
Rama Krishnan Raghupathy
99301d0d95 fix cache test 2017-03-03 16:59:12 -08:00
Rama Krishnan Raghupathy
94dab4559a Merge remote-tracking branch 'upstream/master' into UpdateSDK 2017-03-03 14:27:05 -08:00
Livar
70c65160f6 Merge pull request #5892 from livarcocc/merge_rel101_into_master
Merge rel101 into master
2017-03-03 14:11:06 -08:00
Ravi Eda
8643d4722e Remove BuildPipeline definitions since CLI maintains VSTS definitions only. These checked in definitions will likely be out of sync. 2017-03-03 16:04:13 -06:00
Livar
1f536a11a0 Merge pull request #5913 from dotnet/update-msbuild-and-nuget
Update versions of MSBuild and NuGet
2017-03-03 13:50:14 -08:00
Parallels
a5c7ac12f7 Fixing a couple more merge issues regarding deb generation. 2017-03-03 13:30:57 -08:00
Piotr Puszkiewicz
a9ba12921b Merge pull request #5889 from dotnet/dev/jgoshi/updateDotnetInstallScript
Update the install script to support osname
2017-03-03 12:49:58 -08:00
Daniel Plaisted
4b9c4efc3f Update versions of MSBuild and NuGet 2017-03-03 12:33:56 -08:00
Parallels
f42599dec2 Fixing ubuntu deb generation. 2017-03-03 11:13:41 -08:00
Piotr Puszkiewicz
5eeb3c04fd Merge pull request #5766 from dotnet/blackdwarf-patch-1
Update cli-installation-scenarios.md
2017-03-03 11:13:05 -08:00
Justin Goshi
a66ef9f0ef Fix spacing 2017-03-03 11:05:13 -08:00
Justin Goshi
cdf85ec1d2 Update the descriptino 2017-03-03 11:02:09 -08:00
Justin Goshi
e21c1a4a98 Change the command line argument per PR comments 2017-03-03 09:25:31 -08:00
Justin Goshi
18169e1c6a Merge branch 'master' into dev/jgoshi/updateDotnetInstallScript 2017-03-03 09:12:29 -08:00
Eric Erhardt
7fca740af5 Update NET.Sdk to 1.1.0-alpha-20170303-2 2017-03-03 10:11:30 -06:00