Commit graph

7529 commits

Author SHA1 Message Date
Sean Peters
a49a9680ff bumped the templating build number 2017-11-10 16:26:36 -08:00
Sean Peters
82718a146c Inserting dotnet/templating rel/2.1.0-preview1 into cli master 2017-11-09 15:46:14 -08:00
John Beisner
5bc9335ff8
Merge pull request #7981 from johnbeisner/FixingPublishConditionals
Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB'
2017-11-08 18:16:27 -08:00
John Beisner
e3b32e41ec
Merge pull request #7978 from johnbeisner/NugetConfigModification
Removing Tier 1 repos from Nuget.config
2017-11-08 14:24:20 -08:00
John Beisner
6302b34d56 per code review:
Putting back: https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
2017-11-08 10:33:40 -08:00
John Beisner
e1d3320376 Correcting 'PUBLISH_TO_AZURE_BLOB' and 'PUBLISH_NUPKG_TO_AZURE_BLOB' Booleans - 'false' should not be conveyed by the empty string. 2017-11-08 09:26:32 -08:00
John Beisner
ef42a98a1c Removing Tier 1 repos from Nuget.config; those repos are now coming from the internal 'dotnet-core' feed. 2017-11-07 16:38:39 -08:00
Eric Erhardt
d58fc6120d
Merge pull request #7968 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25907-02 (master)
2017-11-07 14:35:44 -06:00
dotnet-bot
fd738184c1 Update CoreSetup to preview1-25907-02 2017-11-07 17:49:55 +00:00
Nick Guerrera
4db91a217f
Merge pull request #7973 from dotnet/merges/release/15.5-to-master-20171107-080036
Merge release/15.5 to master
2017-11-07 06:31:45 -08:00
John Beisner
ce3c935d81
Merge pull request #7967 from johnbeisner/NewTransportFeedDLL
Changes in the Transport feed DLL requires our response
2017-11-06 19:43:04 -08:00
John Beisner
56d94ff68c Changes in the Transport feed DLL requires our response; change DLL version and base URL. 2017-11-06 14:57:55 -08:00
Livar
fa52a9f1ee
Merge pull request #7966 from dotnet/update_runtime
Update runtime version to preview1-25905-03
2017-11-06 13:57:55 -08:00
Nick Guerrera
3cd6a7802d
Merge pull request #7944 from v-zbsail/localization
LOC CHECKIN | dotnet/cli - release/15.5 | 20171031
2017-11-06 12:33:05 -08:00
Livar
1f423ff22b
Update runtime version to preview1-25905-03 2017-11-06 09:31:45 -08:00
Livar
272311890c
Merge pull request #7962 from dotnet/merges/release/15.5-to-master-20171103-070036
Merge release/15.5 to master
2017-11-03 16:06:52 -07:00
Livar
3056f94cdf
Merge branch 'master' into merges/release/15.5-to-master-20171103-070036 2017-11-03 09:52:13 -07:00
Eric Erhardt
53cbc96d75
Merge pull request #7960 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25902-04 (master)
2017-11-03 09:47:17 -05:00
dotnet-bot
d4f92aa0f0 Update CoreSetup to preview1-25902-04 2017-11-03 00:57:00 +00:00
Livar
d27effe188
Merge pull request #7952 from AndyGerlicher/MSBuild.15.5.172
MSBuild 15.5.172
2017-11-02 09:32:58 -07:00
Livar
4122a72690
Merge pull request #7955 from dotnet/merges/release/15.5-to-master-20171102-070037
Merge release/15.5 to master
2017-11-02 09:32:40 -07:00
Andy Gerlicher
ec1e490395 MSBuild 15.5.172 2017-11-01 15:27:15 -07:00
Livar
8320e20c9c
Merge pull request #7943 from smadala/tp-insert-20171031-01
Insert Testplatform 15.5.0-preview-20171031-01
2017-11-01 10:05:04 -07:00
Livar
b45f1fb439
Merge pull request #7940 from dotnet/merges/release/15.5-to-master-20171031-070033
Merge release/15.5 to master
2017-11-01 10:02:32 -07:00
William Li
8c3b640540 Fix merge 2 2017-10-31 13:37:28 -07:00
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
Zbyněk Sailer
746f092c57 LOC CHECKIN | dotnet/cli - release/15.5 | 20171031 2017-10-31 17:16:46 +01:00
Satya Madala
e7fc8749f3 Insert Testplatform 15.5.0-preview-20171031-01 2017-10-31 20:46:45 +05:30
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