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

7322 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
NuGet Team Bot
a084153c15 Insert NuGet Build 4.5.0-preview1-4526 into cli 2017-10-10 15:08:33 -07: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
jbeisner
b951b94629 Reverting previous change to: 'NuGet.master.config' 2017-10-10 10:34:32 -07:00
Shyam-Gupta
b5d9f6f3e6 Update DependencyVersions.props 2017-10-10 16:50:09 +05:30
Livar Cunha
f6c0c0b468 Merged PR 88810: Adding the pre-release runtime version hack to RHEL as well. Basically, skip 
Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime.
 2017-10-09 23:28:17 +00:00
Livar Cunha
34235acb37 Adding the pre-release runtime version hack to RHEL as well. Basically, skip native installer tests when using a pre-release runtime. 2017-10-09 15:27:05 -07: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
316d2d47f9 Merged PR 88772: Adding the access token to the native installer URLs so that we can download 
Adding the access token to the native installer URLs so that we can download those from protected locations when needed.
 2017-10-09 21:12:33 +00:00
Livar Cunha
ec9b583eb4 Adding the access token to the native installer URLs so that we can download those from protected locations when needed. 2017-10-09 14:09:48 -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 Cunha
946fc45269 Merged PR 88725: Fixing the expected runtime version by the tool tests. 
Fixing the expected runtime version by the tool tests.
 2017-10-09 19:36:32 +00:00
Livar Cunha
e11c66e7f0 Fixing the expected runtime version by the tool tests. 2017-10-09 12:35:38 -07:00
Livar Cunha
8f851ee83c Merged PR 88706: Merge update_branding_and_runtime to release/2.0.0-MSRC 2017-10-09 18:54:10 +00:00
Livar Cunha
7ce43b9e3e Updating the runtime version. 2017-10-09 11:42:21 -07:00
Livar Cunha
d7ef3d244b Updating the branding to 15.5.1 2017-10-09 11:37:04 -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
Livar Cunha
ca06075140 Merged PR 88687: Merge merge_release200_into_release200MSRC to release/2.0.0-MSRC 2017-10-09 18:07:59 +00: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
Livar Cunha
36892f28e9 Adding a test hack to allow the CLI to pass tests with a pre-release runtime for 2.0 TFM. 2017-10-06 11:08:02 -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 Cunha
e6c0c6ef15 Merge branch 'release/2.0.0' into merge_release200_into_release200MSRC 
* release/2.0.0: (49 commits)
  Keeping the branding for release/2.0.0 at 2.0.3.
  Moving the runtime version to 2.0.0 for the SDK.
  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.
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  ...
 2017-10-05 10:27:38 -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 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
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07: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
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113 
MSBuild 15.5.113
 2017-10-03 09:55:17 -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