Commit graph

7699 commits

Author SHA1 Message Date
Nick Guerrera
173cc035e4 Merge pull request #7906 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25825-07 (master)
2017-10-25 16:24:29 -07:00
dotnet-bot
7d3ac35d84 Update CoreSetup to preview1-25825-07 2017-10-25 22:19:32 +00:00
Livar
1246175240 Adding the Microsoft.DotNet.Build.Tasks.Feed tasks 2017-10-25 10:47:33 -07:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Nate McMaster
102a8cfc49 Merged PR 91084: Update aspnetcore to 2.0.3 build 123
Update aspnetcore to 2.0.3 build 123.

Also, new packages are in dotnetbuilddropsmsrc/**msrc-2-0-aspnet-20171024**
2017-10-25 03:18:46 +00:00
Nate McMaster
347169e68a Update aspnetcore to 2.0.3 build 123 2017-10-24 15:27:08 -07:00
Nick Guerrera
20b0b820a8 Remove unnecessary handling of verbosity in RestoreCommand
We were taking care to set the console verbosity to minimal, but
only when no verbosity argument is passed. However, the default
verbosity for all CLI msbuild commands is already minimal and so
we can just get out of the way.
2017-10-24 15:04:24 -07:00
Livar
f6f8865ee2 Merge pull request #7880 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25823-01 (master)
2017-10-24 12:45:47 -07:00
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
Livar Cunha
687cba8ca8 Updating branding to 2.0.3, again 2017-10-20 16:35:01 -07:00
Livar Cunha
e37e9f3fe8 Fixing closing tags in the DEB and RPM targets. 2017-10-20 14:43:29 -07:00
Livar Cunha
d4f980a02e Enabling our native installer tests to always get a 2.0.0 asp.net runtime store. We need to solve this in a more generic way in the future. But this will unblock the build for now. 2017-10-20 14:23:34 -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
Nate McMaster
372739a91f Merged PR 90385: Update aspnetcore runtime store and LZMA to 2.0.3 build 120
Update aspnetcore runtime store and LZMA to 2.0.3 build 120.

The nupkgs for the templates and runtime are in dotnetbuilddropsmsrc/msrc-2-0-aspnet-20171018
2017-10-20 17:15:41 +00: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
Nate McMaster
be1b014c7c Update aspnetcore runtime store and LZMA to 2.0.3 build 120 2017-10-20 08:59:31 -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 Cunha
c85173f757 Merged PR 90125: Merge merge_release_200 to release/2.0.0-MSRC 2017-10-18 00:39:58 +00:00
Livar Cunha
72eda50303 Merge branch 'release/2.0.0' into merge_release_200
* release/2.0.0:
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  MSBuild 15.4.8
  Insert SDK 2.0.2-vspre-20170927-1
2017-10-17 17:30:58 -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