Commit graph

9786 commits

Author SHA1 Message Date
William Lee
812cfbe90c
Update SDK version to 15.5.0-preview-20171027-2 (#7925) 2017-10-27 12:29:19 -07:00
Livar Cunha
dfd20eaf30 Updating the version of the command line parser. 2017-10-27 11:17:18 -07:00
Livar
1e70555569
Merge pull request #7842 from peterhuene/fix-7699
Fix relative path handling on Windows.
2017-10-27 11:07:11 -07:00
William Lee
cef9a90ad1
Hashed telemetry and event name change (#7919) 2017-10-27 10:58:25 -07:00
Nate McMaster
77349eec4c Merged PR 91574: Update aspnetcore to 2.0.3 build 124
Update aspnetcore to 2.0.3 build 124

@<licavalc@microsoft.com> the new packages are in dotnetbuilddropsmsrc/**msrc-2-0-aspnet-20171027**

Wait for @<johluo@microsoft.com> 's signoff too. I believe he still needs to double check the assets in the dontetclimsrc blob store.
2017-10-27 17:31:42 +00:00
Livar
60c6814a90
Merge pull request #7914 from AndyGerlicher/MSBuild.15.5.169
MSBuild 15.5.170
2017-10-27 09:27:05 -07:00
Nate McMaster
878532eedf Update aspnetcore to 2.0.3 build 124 2017-10-27 07:57:14 -07:00
Nick Guerrera
35b7ad2789 Use msbuild /restore instead of separate invocations where possible
It is not currently possible when there is a -f|--framework argument because
we cannot force a TargetFramework global property on to the restore evaluation.
Doing so completely breaks restore by applying the TargetFramework to all
projects transitively. The correct behavior is to restore for all frameworks,
then build/publish/etc for the given target framework. Achieving that still
requires two distinct msbuild invocations.

This also changes the verbosity of implicit restore from quiet to that
of the subsequent command (default=minimal). Similar to global properties,
we cannot specify a distinct console verbosity for the /restore portion of
the overall execution. For consistency, we apply the same verbosity change
to the case where we still use two separate msbuild invocations.

This also fixes an issue where the separate restore invocation's msbuild log
would be overwritten by the subsequent command execution. However, this remains
unfixed in the case where we still use two separate msbuild invocations.
2017-10-26 16:01:34 -07:00
Livar
954b9a3ee1 Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-26 15:13:01 -07:00
Andy Gerlicher
4c804c3421 MSBuild 15.5.170 2017-10-26 12:46:37 -07:00
Nick Guerrera
8fead788d7 Fix dotnet build /clp:NoSummary 2017-10-26 06:37:45 -07:00
Andy Gerlicher
ac921f3668 Remove ImportAfter target for NuGet
MSBuild common targets now import NuGet.targets directly, this is no
longer needed.
2017-10-25 16:41:57 -07:00
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
Nick Guerrera
77603cc5ca Merge pull request #10 from nguerrera/dev/repo-refactoring
Merge dotnet/cli:dev/release/2.0 into dev/repo-refactoring
2017-10-20 12:55:03 -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
Nick Guerrera
a149ec56cb Update toolset to latest 2.0.3-servicing 2017-10-19 16:57:07 -07:00
Nick Guerrera
69a3c9d248 Merge dotnet/cli:dev/release/2.0 into dev/repo-refactoring 2017-10-19 16:44:10 -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
Nick Guerrera
686d1b71cf Merge pull request #7857 from dotnet/accept-patches
Port source-build patches to dev/release/2.0
2017-10-19 15:38:13 -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
Nick Guerrera
b18db61594 ifdef out entire update versions task in source build 2017-10-19 11:00:13 -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
Nick Guerrera
2cdfe936f4 Eliminate downgrade errors 2017-10-18 16:12:14 -07:00
Nick Guerrera
a7aeab79d8 Fix problems with excluding MSBuildSdkResolver from build 2017-10-18 16:12:14 -07:00
Eric Erhardt
aea3f64ab2 Enable CLI to build on Windows during source-build. Don't build for net46 and use correct RID for core-setup. 2017-10-18 16:12:14 -07:00
Eric Erhardt
12931ba320 Fix update-dependencies.
Don't import the root Directory.Build.props during update-dependencies because it imports generated .props files that don't exist outside of the build.

(cherry picked from commit 0491fd3826)
2017-10-18 16:12:13 -07:00