Commit graph

7107 commits

Author SHA1 Message Date
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
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
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 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
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -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
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -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
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
Livar
f4f0aeae63 Merge pull request #7729 from mlorbetske/dev/mlorbe/UpdateErrorStringForMisspelledOrCorruptedLaunchProfile
Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object
2017-09-29 15:35:31 -07:00
Andy Gerlicher
fb67e25cfb MSBuild 15.5.110 2017-09-29 13:31:56 -07:00
Mike Lorbetske
b1fda1c367 Update XLFs 2017-09-29 12:59:44 -07:00
Mike Lorbetske
ccbc9f73f7 Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object 2017-09-29 10:43:01 -07:00
Daniel Plaisted
a04b4bf512 Merge pull request #7717 from AndyGerlicher/MSBuild.15.4.8
MSBuild 15.4.8
2017-09-27 17:55:36 -07:00
Livar
68f6619b09 Merge pull request #7720 from livarcocc/updating_branding_155
Updating the branding to 15.5.
2017-09-27 16:57:41 -07:00
Livar Cunha
19ce791408 Updating the branding to 15.5. 2017-09-27 15:24:22 -07:00