Livar Cunha
27aa698710
Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
2017-10-13 09:56:08 -07:00
Livar Cunha
1943ddc57f
Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171013-070028
...
* dotnet/release/2.0.0:
Use temporary path for fake deps.json in test
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
'NuGet.master.config' does not appear to be used.
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
2017-10-13 09:04:58 -07:00
Harsh Jain
41d1f6ad6d
Updated version of TPv2
2017-10-13 14:09:32 +05:30
Nick Guerrera
c0c4be7946
Merge branch 'release/2.0-vs' into merge-2.0-vs
2017-10-12 18:22:04 -07:00
Nick Guerrera
7b558111ae
Use same build number for roslyn and F# satellites
2017-10-12 16:22:06 -07:00
Livar Cunha
f6a07bcb39
Merge branch 'release/2.0.0' into merge_release_200
...
* release/2.0.0:
Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
'NuGet.master.config' does not appear to be used.
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
2017-10-12 14:56:23 -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
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
821a413dd6
Updating Roslyn satellites and SDK versions
2017-10-11 22:29:40 -07: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
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
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
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
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
Shyam-Gupta
b5d9f6f3e6
Update DependencyVersions.props
2017-10-10 16:50:09 +05:30
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 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
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
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
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
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 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
dotnet-bot
6066e1ce3a
Update CoreSetup to preview1-25806-01
2017-10-06 17:40:13 +00:00
Livar
c950f92462
Update the SDK to 2.1.0-preview1-20171006-4
2017-10-05 16:39:32 -07:00
dotnet-bot
ad0ecd6914
Update CoreSetup to preview1-25805-02
2017-10-05 21:39:21 +00: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 Cunha
ed953f6d05
Keeping the branding for release/2.0.0 at 2.0.3.
2017-10-04 18:07:10 -07:00
dotnet-bot
58c76ff1ce
Update CoreSetup to preview1-25804-01
2017-10-04 17:28:30 +00: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
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
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
