Livar
38b935e47a
Merge pull request #7893 from dotnet/merges/release/2.0.0-to-release/15.5-20171024-070026
...
Merge release/2.0.0 to release/15.5
2017-10-24 12:45:25 -07:00
Peter Huene
03f0c51292
Fix relative path handling on Windows.
...
On Windows, `PathUtility.GetRelativePath` was not properly handling
paths that differed by case in the drive reference (e.g. "C:\" vs.
"c:\"). The fix was to add the missing case-insensitive comparison
argument.
Replaced uses of `PathUtility.GetRelativePath` with
`Path.GetRelativePath` where possible (requires 2.0.0+).
Additionally, `PathUtility.RemoveExtraPathSeparators` was not handling
paths with drive references on Windows. If the path contained a drive
reference, the separator between the drive reference and the first part
of the path was removed. This is due to `Path.Combine` not handling
this case, so an explicit concatenation of the separator was added.
This commit resolves issue #7699 .
2017-10-24 11:23:52 -07:00
Livar
835d38b27f
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171024-070026
2017-10-24 10:09:16 -07:00
Livar
1421c10f1d
Merge pull request #7891 from AndyGerlicher/MSBuild.15.5.165
...
MSBuild 15.5.165
2017-10-24 10:05:00 -07:00
Andy Gerlicher
f81c0fc1d7
MSBuild 15.5.165
2017-10-23 14:59:24 -07:00
Kevin Ransom
6ef8af7d6d
update fsharp compiler for preview release
2017-10-23 14:47:31 -07:00
dotnet-bot
fa2bd27688
Update CoreSetup to preview1-25823-01
2017-10-23 17:28:38 +00:00
John Beisner
b11cabca4a
Merge pull request #7876 from johnbeisner/PublishToTransportFeed
...
Enabling the publish of CLI NuPkg to the unified Transport feed; part 2
2017-10-23 10:18:58 -07:00
John Beisner
f26e651c6a
Defining the published Nupkgs in one place.
2017-10-20 14:02:41 -07:00
John Beisner
9bd54acabe
Adding the second CLI NuPkg
2017-10-20 11:55:14 -07:00
John Beisner
7fe5bda018
Merge pull request #7848 from johnbeisner/PublishToTransportFeed
...
Enabling the publish of CLI NuPkg to the unified Transport feed.
2017-10-20 09:23:18 -07:00
Livar
82d9bbc2f2
Merge pull request #7868 from dotnet/merges/release/15.5-to-master-20171019-070029
...
Merge release/15.5 to master
2017-10-19 16:25:55 -07:00
Livar
b50595c419
Merge branch 'master' into merges/release/15.5-to-master-20171019-070029
2017-10-19 11:26:33 -07:00
Kevin Ransom (msft)
1860d2f513
Merge pull request #7866 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25818-02 (master)
2017-10-19 11:07:30 -07:00
Livar
0d51d3d0f7
Merge branch 'master' into master-UpdateDependencies
2017-10-18 20:16:33 -07:00
Livar
ffbb8b14b5
Merge pull request #7862 from dotnet/merges/release/15.5-to-master-20171018-070036
...
Merge release/15.5 to master
2017-10-18 16:42:22 -07:00
dotnet-bot
5537be658f
Update CoreSetup to preview1-25818-02
2017-10-18 21:35:19 +00:00
Livar
aad235fd1c
Merge branch 'master' into merges/release/15.5-to-master-20171018-070036
2017-10-18 12:20:03 -07:00
Livar
8d7863e103
Merge pull request #7865 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25818-01 (master)
2017-10-18 11:38:33 -07:00
Livar
f657648f07
Merge pull request #7864 from dotnet/livarcocc-patch-2
...
Update SDK to 15.5.0-preview-20171018-2
2017-10-18 11:38:13 -07:00
Livar
569ae654ae
Merge pull request #7860 from dotnet/livarcocc-patch-3
...
Updating the version on master to 2.2.0
2017-10-18 10:54:32 -07:00
dotnet-bot
8b69a7506a
Update CoreSetup to preview1-25818-01
2017-10-18 17:45:51 +00:00
Livar
d3098e7fcd
Update SDK to 15.5.0-preview-20171018-2
2017-10-18 10:40:15 -07:00
Livar
150757bf66
Merge pull request #7859 from dotnet/livarcocc-patch-2
...
Updating ASP.NET templates to 1.0.0-beta2-20170810-304
2017-10-18 09:56:16 -07:00
Livar
2cd143d949
Merge pull request #7858 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25817-05 (master)
2017-10-17 20:52:50 -07:00
Livar
8e2b99dae1
Removing a bundled template that should not be here.
...
Microsoft.DotNet.Web.Client.ItemTemplates should not be here yet.
2017-10-17 17:53:18 -07:00
Livar
a450165732
Updating the branding to 2.2.0
2017-10-17 16:54:22 -07:00
Livar
13ba5efc12
Updating the version on master to 2.2.0
2017-10-17 16:53:50 -07:00
Livar
9bd976f5ec
Updating ASP.NET templates to 1.0.0-beta2-20170810-304
2017-10-17 16:52:20 -07:00
Livar
730affa440
Merge branch 'master' into master-UpdateDependencies
2017-10-17 16:26:04 -07:00
Livar
2258ab811c
Merge pull request #7845 from dotnet/merges/release/15.5-to-master-20171016-070031
...
Merge release/15.5 to master
2017-10-17 16:24:48 -07:00
Livar
a34ecdeff6
Merge branch 'master' into merges/release/15.5-to-master-20171016-070031
2017-10-17 14:42:15 -07:00
dotnet-bot
3484dd26df
Update CoreSetup to preview1-25817-05
2017-10-17 21:40:36 +00:00
Kevin Ransom (msft)
182e0ca569
Merge pull request #7855 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25817-01 (master)
2017-10-17 14:13:33 -07:00
Livar Cunha
4577a7839a
Fixing the windows build.
2017-10-17 13:43:19 -07:00
Livar
5d44ab70cd
Merge pull request #7856 from livarcocc/update_branding_to_2_1
...
Updating the brand to 2.1.1.
2017-10-17 13:20:30 -07:00
Livar
c8c55e8edd
Merge pull request #7854 from livarcocc/update_roslyn
...
Update the roslyn version to 2.6.0-beta2-62210-01.
2017-10-17 11:37:19 -07:00
Livar
966e133565
Merge branch 'master' into merges/release/15.5-to-master-20171016-070031
2017-10-17 11:36:43 -07:00
Livar Cunha
bfb045e311
Updating the brand to 2.1.1.
2017-10-17 11:22:24 -07:00
dotnet-bot
a6b40da4ae
Update CoreSetup to preview1-25817-01
2017-10-17 17:50:35 +00:00
Livar
95dafad76b
Merge branch 'release/15.5' into update_roslyn
2017-10-17 10:09:24 -07:00
Livar
a1ecb3bb3f
Merge pull request #7850 from dotnet/livarcocc-patch-2
...
Adding a note about needing additional feeds
2017-10-17 09:51:14 -07:00
Livar
c4faa28ffa
Merge pull request #7847 from AndyGerlicher/MSBuild.15.5.160
...
MSBuild 15.5.160
2017-10-17 09:50:22 -07:00
Livar Cunha
ea158bb686
Update the roslyn version to 2.6.0-beta2-62210-01.
2017-10-17 09:48:16 -07:00
John Beisner
f33310fefc
Make the uploads to blob storage more exacting.
2017-10-17 09:08:35 -07:00
Eric Erhardt
fa8006cf9e
Merge pull request #7846 from dotnet-bot/master-UpdateDependencies
...
Update CoreSetup to preview1-25816-02 (master)
2017-10-17 08:57:46 -05:00
Livar
c434233ba5
Adding a note about needing additional feeds
...
Additional feeds may be necessary when consuming pre-release bits. Added this additional information to the README page of the CLI.
2017-10-16 21:16:43 -07:00
Livar
54b754aafb
Merge pull request #7849 from dsplaisted/insert-sdk
...
Insert SDK 15.5.0-preview-20171017-1
2017-10-16 18:09:37 -07:00
Daniel Plaisted
2a3a5be07d
Insert SDK 15.5.0-preview-20171017-1
2017-10-16 17:23:12 -07:00
Livar
9de48be817
Merge pull request #7834 from harshjain2/TPv2LatestRelease
...
Updated version of TestPlatform to 15.5.0-preview-20171012-09
2017-10-16 15:52:49 -07:00