mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7456 commits 41 branches 190 tags 95 MiB
Commit graph

7456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Livar
cea4c38789 Merge pull request #7830 from nguerrera/merge-2.0-vs 
Merge release/2.0-vs into release/2.0.0
 2017-10-13 09:01:17 -07:00
Harsh Jain
41d1f6ad6d Updated version of TPv2 2017-10-13 14:09:32 +05:30
Nick Guerrera
fe57933b09 Merge pull request #7829 from nguerrera/port-json-flakiness-fix 
Use temporary path for fake deps.json in test
 2017-10-12 20:29:28 -07:00
Nick Guerrera
c0c4be7946 Merge branch 'release/2.0-vs' into merge-2.0-vs 2017-10-12 18:22:04 -07:00
Nick Guerrera
e59fd7af46 Use temporary path for fake deps.json in test 
(cherry picked from commit 796b4a06e7)
 2017-10-12 16:32:12 -07:00
Nick Guerrera
7b558111ae Use same build number for roslyn and F# satellites 2017-10-12 16:22:06 -07:00
Livar
428b2caa6b Merge pull request #7814 from AndyGerlicher/MSBuild.15.5.154 
MSBuild 15.5.154
 2017-10-12 13:51:38 -07:00
Livar
8c589212c8 Merge pull request #7802 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25810-02 (master)
 2017-10-12 12:59:11 -07:00
Livar
278cbf6c44 Merge pull request #7819 from dotnet/livarcocc-patch-2 
Updating Roslyn satellites and SDK versions
 2017-10-11 23:54:09 -07:00
Livar
65caf8faab Merge pull request #7817 from dotnet/nuget-insertbuild4529 
Insert NuGet Build 4.5.0-preview2-4529 into cli
 2017-10-11 22:30:55 -07:00
Livar
821a413dd6 Updating Roslyn satellites and SDK versions 2017-10-11 22:29:40 -07:00
Eric Erhardt
484714df1b Exclude Desktop framework assemblies in the "Extensions" folder from crossgen. 
Work around MSBuild globbing bug in a Target by just excluding the one assembly.

See https://github.com/Microsoft/msbuild/issues/2631
 2017-10-11 22:31:27 -05:00
NuGet Team Bot
15ee853d49 Insert NuGet Build 4.5.0-preview2-4529 into cli 2017-10-11 18:44:34 -07:00
Livar
95a56ffcfe Merge pull request #7811 from seancpeters/15.5_separate_aspnet_templates 
Added a property to DependencyVersions.props for asp.net template version
 2017-10-11 18:40:24 -07:00
Livar
58bbbe8c1a Merge branch 'release/15.5' into MSBuild.15.5.154 2017-10-11 18:37:03 -07:00
Livar
9d0d22a0e0 Merge pull request #7813 from AndyGerlicher/MSBuild.15.5.153 
MSBuild 15.5.153 (No Double Evaluation Fix)
 2017-10-11 18:36:34 -07:00
Andy Gerlicher
d15d448332 Update NuGet to 4529 (signed) 2017-10-11 18:30:57 -07:00
Andy Gerlicher
97f4a01869 MSBuild 15.5.154 2017-10-11 17:27:36 -07:00
Andy Gerlicher
3b09db3f9e MSBuild 15.5.153 2017-10-11 17:26:43 -07:00
seancpeters
2d6314e78f removed commented out config I'd meant to remove 2017-10-11 16:37:49 -07:00
seancpeters
c6139adcc9 added a way to specify the asp.net template versions 2017-10-11 16:22:03 -07:00
John Beisner
cc8fe368f8 Merge pull request #7809 from johnbeisner/NugetMasterConfigRemove 
'NuGet.master.config' does not appear to be used.
 2017-10-11 11:52:58 -07:00
John Beisner
336998f946 Merge pull request #7810 from johnbeisner/MoveScript 
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
 2017-10-11 11:52:48 -07:00
John Beisner
cbede56d08 Merge pull request #7807 from janvorli/update-centos-6-docker-image 
Update CentOS 6 base docker image
 2017-10-11 11:17:48 -07:00
John Beisner
282de2bfe2 Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0 2017-10-11 10:53:53 -07:00
John Beisner
903001c51c 'NuGet.master.config' does not appear to be used. 2017-10-11 10:25:55 -07:00
Daniel Plaisted
0a3f2a7265 Merge pull request #7804 from dsplaisted/branchinfo-15.5 
Update branch info to release/15.5
 2017-10-11 10:21:39 -07:00
Jan Vorlicek
41571303c0 Update CentOS 6 base docker image 
This update fixes problem with git not supporting https protocol (which
wasn't affecting cli, but the other repos). The image now has a build of
CURL that supports file:// protocol and so I am removing the workaround
from the Dockerfile.
 2017-10-11 19:05:17 +02:00
Livar
c27dd7e9fe Merge pull request #7792 from Shyam-Gupta/TPv2VersionUpgrade 
Updated version of TestPlatform to ‘15.5.0-preview-20171009-10’
 2017-10-11 09:45:27 -07:00
Livar
ee6707ced0 Merge pull request #7796 from dotnet/merges/release/2.0.0-to-master-20171010-070030 
Merge release/2.0.0 to master
 2017-10-11 09:44:28 -07:00
faahmad
273f4bc4a5 Fixed tests 2017-10-11 12:21:59 +05:30
faahmad
6f41ca4de7 Merge branch 'release/15.5' into updateTpv215.5.0-preview-20171009-10 
# Conflicts:
#	build/DependencyVersions.props
 2017-10-11 12:09:40 +05:30
Daniel Plaisted
857c7e3e56 Update branch info to release/15.5 2017-10-10 22:11:00 -07:00
Livar Cunha
4cb25d62af Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20171010-070030 
* dotnet/release/2.0.0:
  Reverting previous change to: 'NuGet.master.config'
  Moving the runtime version to 2.0.0 for the SDK.
  Revert release/2.0.0 back to 1bcee43995
  Adding the unified transport NuGet feed.
  Keeping the branding for release/2.0.0 at 2.0.3.
  Moving the runtime version to 2.0.0 for the SDK.
  Update cli-deps-satellites
  Fix up roslyn satellite assembly handling to match new insertion mechanism
  MSBuild 15.5.113
  Update F# compiler
  Remove CscToolPath
  Improve the way Roslyn is pulled in
  MSBuild 15.5.110
  Update XLFs
  Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
  Updating the branding to 15.5.
 2017-10-10 21:12:02 -07:00
Livar
7f5c9ec12a Merge pull request #7803 from dotnet/vramak/websdk_15_5 
Updating the websdk version to 2.0.0-rel-20171010-665
 2017-10-10 21:07:53 -07:00
Livar
edf6f6db81 Merge pull request #7801 from dotnet/nuget-insertbuild4526 
Insert NuGet Build 4.5.0-preview1-4526 into cli
 2017-10-10 21:06:13 -07:00
Vijay Ramakrishnan
6a116d4b94 Updating the websdk version to 2.0.0-rel-20171010-665 2017-10-10 16:38:32 -07:00
dotnet-bot
ce29ec42e8 Update CoreSetup to preview1-25810-02 2017-10-10 22:28:57 +00:00
NuGet Team Bot
a084153c15 Insert NuGet Build 4.5.0-preview1-4526 into cli 2017-10-10 15:08:33 -07:00
Jan Vorlicek
93b425ef90 Merge pull request #7799 from janvorli/add-rhel6-ci 
Add RHEL6 leg to the CI
 2017-10-10 23:39:36 +02:00
John Beisner
ce6f396f94 Merge pull request #7794 from johnbeisner/AddTransportFeed 
CLI: Adding the unified NuGet Transport feed.
 2017-10-10 12:39:37 -07:00
Jan Vorlicek
9b75c07bf1 Fix missing RID in the CI build invocation 2017-10-10 20:00:12 +02:00
jbeisner
b951b94629 Reverting previous change to: 'NuGet.master.config' 2017-10-10 10:34:32 -07:00
Jan Vorlicek
048686178c Add RHEL6 leg to the CI 2017-10-10 18:08:06 +02:00
Jan Vorlicek
294b2007d2 Merge pull request #7797 from janvorli/fix-centos-docker-image 
Fix RHEL 6 Dockerfile
 2017-10-10 17:55:07 +02:00
Shyam-Gupta
b5d9f6f3e6 Update DependencyVersions.props 2017-10-10 16:50:09 +05:30
Jan Vorlicek
ee566157cb Fix RHEL 6 Dockerfile 
The new base docker image sets the LD_LIBRARY_PATH to /usr/local/lib
and the yum is not compatible with the special CURL version we build.
This change fixes that by clearing the LD_LIBRARY_PATH for the yum
command invocation.
 2017-10-10 11:38:55 +02:00
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