Commit graph

7609 commits

Author SHA1 Message Date
Livar
536e87518a Merge pull request #7795 from nguerrera/remove-15.5-from-2.0
Remove 15.5 from 2.0
2017-10-09 15:18:56 -07:00
Livar Cunha
fead8521c3 Moving the runtime version to 2.0.0 for the SDK.
(cherry picked from commit e24b53dda7)
2017-10-09 13:59:09 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -07:00
jbeisner
58bdb63c53 Adding the unified transport NuGet feed. 2017-10-09 13:34:24 -07:00
Livar
da92efce24 Merge pull request #7789 from dotnet/merges/release/15.5-to-release/2.0.0-20171009-070027
Merge release/15.5 to release/2.0.0
2017-10-09 11:11:03 -07:00
Shyam-Gupta
9a2e87f0d9 Updated version of TestPlatform to 15.5.0-preview-20170923-02
refer commit: fa876f5b90
2017-10-09 17:46:08 +05:30
Kevin Ransom (msft)
27e11e7f80 Merge pull request #7785 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25806-02 (master)
2017-10-06 19:01:47 -07:00
dotnet-bot
c23cd33b28 Update CoreSetup to preview1-25806-02 2017-10-06 22:06:36 +00:00
Eric Erhardt
a629d569a3 Merge pull request #7780 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25806-01 (master)
2017-10-06 16:17:16 -05:00
Jan Vorlicek
cdc357ad8f Merge pull request #7771 from janvorli/update-centos-docker-image
Update CentOS 6 Dockerfile
2017-10-06 23:06:30 +02:00
Livar
5407978c13 Merge pull request #7772 from dotnet/livarcocc-patch-2
Update the SDK to 2.1.0-preview1-20171006-4
2017-10-06 11:49:05 -07:00
Livar
b891db5bdd Merge pull request #7773 from nguerrera/tool-json-flakiness
Fix tool json flakiness
2017-10-06 11:48:48 -07:00
John Beisner
71ef664f73 Merge pull request #7756 from benknoble/quote-fix
Quote variable expansions in dotnet-install.sh
2017-10-06 11:41:25 -07:00
Nick Guerrera
796b4a06e7 Use temporary path for fake deps.json in test 2017-10-06 10:53:21 -07:00
dotnet-bot
6066e1ce3a Update CoreSetup to preview1-25806-01 2017-10-06 17:40:13 +00:00
Nick Guerrera
46ef8581a6 Merge pull request #7768 from nguerrera/path-append
Append to existing PATH in build env scripts/cli-test-env.bat
2017-10-05 18:01:58 -07:00
Livar
bae42f23c5 Merge pull request #7766 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25805-02 (master)
2017-10-05 16:42:34 -07:00
Livar
c950f92462 Update the SDK to 2.1.0-preview1-20171006-4 2017-10-05 16:39:32 -07:00
Jan Vorlicek
68fed641a1 Update CentOS 6 Dockerfile
Replace the base image with an updated one that now contains
clang 3.9 with PGO support and also the new git. So we don't
need to build it here anymore.
2017-10-06 01:37:33 +02:00
dotnet-bot
ad0ecd6914 Update CoreSetup to preview1-25805-02 2017-10-05 21:39:21 +00:00
Nick Guerrera
241bf475f0 Append to existing PATH in build env scripts/cli-test-env.bat
We were clobbering the path down to just one directory
2017-10-05 13:27:49 -07:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc
Update satellite assemblies and fix up roslyn satellite handling
2017-10-05 11:25:07 -07:00
Livar
7f4095eeb1 Merge pull request #7762 from livarcocc/merge_release155_into_release200
Merge release/15.5 into release/2.0.0
2017-10-05 10:25:58 -07:00
Livar
692ca89882 Merge pull request #7754 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25804-01 (master)
2017-10-05 10:12:21 -07:00
Livar Cunha
ed953f6d05 Keeping the branding for release/2.0.0 at 2.0.3. 2017-10-04 18:07:10 -07:00
Livar
19e631ea47 Merge pull request #7757 from livarcocc/revert_runtime_to_200
Moving the runtime version to 2.0.0 for the SDK.
2017-10-04 13:25:40 -07:00
David Ben Knoble
8d671caef4 Remove unnecessary quotes per review 2017-10-04 15:33:45 -04:00
dotnet-bot
58c76ff1ce Update CoreSetup to preview1-25804-01 2017-10-04 17:28:30 +00:00
David Ben Knoble
0ee5b46cd7 Remove copy logging; unquote override_switch
The copy logging is no longer needed (cf. 191ffece6)

The quotes around the override switch caused cp to see "" as a target
2017-10-04 12:06:29 -04:00
David Ben Knoble
191ffece69 Log copying during dotnet-install.sh
There's an issue copying some of the files and I can't identify it
specifically. I need to see it in the test output.

I will revert this when I have identified and fixed the problem.
2017-10-04 09:42:12 -04:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
David Ben Knoble
b8e179501f Quote variable expansions in dotnet-install.sh
Fix #5281 to prevent paths with spaces from causing problems due to word
splitting.
2017-10-03 19:24:02 -04:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
2017-10-03 16:00:56 -07:00
Livar
e2c89f3d61 Merge pull request #7753 from dotnet/livarcocc-patch-2
Update the known issues location
2017-10-03 14:42:27 -07:00
John Beisner
d498ab677e Merge pull request #7747 from johnbeisner/RedHat6Stuff
Missing value for 'PublishNativeInstallers' and Updating the README
2017-10-03 10:17:32 -07:00
Livar
c43b2b8267 Update the known issues location 2017-10-03 10:13:22 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113
MSBuild 15.5.113
2017-10-03 09:55:17 -07:00
John Beisner
659c672411 Missing value for 'PublishNativeInstallers' 2017-10-03 08:58:52 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5
Update FSharp compiler
2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
John Beisner
ddae35eadf Updating the README 2017-10-02 16:47:17 -07:00
William Lee
85ce73dfb5 Use Newtonsoft.Json for UploadToLinuxPackageRepository (#7745) 2017-10-02 16:39:37 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
Livar
3cebbb4ea3 Merge pull request #7746 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25802-02 (master)
2017-10-02 16:37:24 -07:00
Livar
d797f2de2c Merge pull request #7311 from khyperia/improve_roslyn
Improve the way Roslyn is pulled in
2017-10-02 16:33:56 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
Livar
72b3867943 Merge pull request #7743 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25802-01 (master)
2017-10-02 13:50:12 -07:00
Livar
fa9ae3de02 Merge pull request #7731 from AndyGerlicher/MSBuild.15.5.110
MSBuild 15.5.110
2017-10-02 13:49:55 -07:00