mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7502 commits 41 branches 190 tags 95 MiB
Commit graph

7502 commits

This branch
This branch
All branches
Author SHA1 Message Date
William Li
9a31be84d6 Fix merge 2017-10-31 13:05:46 -07:00
Livar
2031c9cf33
Merge branch 'master' into merges/release/15.5-to-master-20171031-070033 2017-10-31 10:15:11 -07:00
Nick Guerrera
9469978fe4
Merge pull request #7938 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25830-04 (master)
 2017-10-30 18:54:25 -07:00
John Beisner
1da32236eb
Merge pull request #7939 from johnbeisner/NewTransportFeedDLL 
The transport feed DLL method: 'PushToBlobFeed' parameters have changed
 2017-10-30 18:02:54 -07:00
John Beisner
e6b8ef5bb7 The transport feed DLL method: 'PushToBlobFeed' parameters have changed with the newer DLL. 2017-10-30 16:40:49 -07:00
dotnet-bot
c59ad5a4c6 Update CoreSetup to preview1-25830-04 2017-10-30 23:00:25 +00:00
Livar
059f82c49e
Merge pull request #7933 from dotnet/livarcocc-patch-2 
Clarify when myapp.exe and myapp.runtimeconfig.json are needed
 2017-10-30 14:58:16 -07:00
William Lee
71167a9c6f
Sync solution (#7887) 
So there is no error open in VS
 2017-10-30 13:00:02 -07:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942 
Merge release/15.5 to master
 2017-10-30 10:56:28 -07:00
Livar
9393fa6f1d
Merge pull request #7929 from dotnet/merges/release/2.0.0-to-release/15.5-20171030-065952 
Merge release/2.0.0 to release/15.5
 2017-10-30 10:18:41 -07:00
Livar
8797fecdbc
Updating the transport feed DLL to 1.0.0-prerelease-02130-01 2017-10-30 10:16:35 -07:00
Livar
d1b1454976
Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171030-065952 2017-10-30 09:40:54 -07:00
Livar
f67c59868c
Clarify when myapp.exe and myapp.runtimeconfig.json are needed 2017-10-30 09:32:39 -07:00
Livar
7c69ecd47f
Merge pull request #7924 from livarcocc/update-cli-commandline-parser 
Updating the version of the command line parser.
 2017-10-27 15:53:49 -07:00
Livar
ed97ee9123
Merge pull request #7890 from KevinRansom/release/2.0.0 
update fsharp compiler for preview release
 2017-10-27 15:52:51 -07:00
Nick Guerrera
cd489a356a
Merge pull request #7896 from nguerrera/one-process-restore 
Use msbuild /restore instead of a separate process
 2017-10-27 15:33:09 -07:00
Kevin Ransom
8a60d17f0c Update F# compiler to match VS 2017-10-27 15:00:25 -07:00
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
Livar
60c6814a90
Merge pull request #7914 from AndyGerlicher/MSBuild.15.5.169 
MSBuild 15.5.170
 2017-10-27 09:27:05 -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
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
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