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

7581 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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