Commit graph

9013 commits

Author SHA1 Message Date
Livar
7794eed633
Merge pull request #9451 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup, coresetup, coresetup to preview1-26609-02, preview1-26609-02, preview1-26609-02, respectively (master)
2018-06-09 17:09:46 -07:00
dotnet-maestro-bot
9a313bcb64 Update coresetup, coresetup, coresetup to preview1-26609-02, preview1-26609-02, preview1-26609-02, respectively 2018-06-09 17:42:16 +00:00
Livar
d383432d3d
Merge pull request #9449 from dotnet-maestro-bot/master-UpdateDependencies
Update coresetup, coresetup, coresetup, roslyn to preview1-26609-01, preview1-26609-01, preview1-26609-01, beta6-62923-07, respectively (master)
2018-06-09 10:24:21 -07:00
dotnet-maestro-bot
22f885492b Update coresetup, coresetup, coresetup, roslyn to preview1-26609-01, preview1-26609-01, preview1-26609-01, beta6-62923-07, respectively 2018-06-09 05:44:50 +00:00
Nate McMaster
ee81e8d7cb
Merge pull request #9447 from natemcmaster/install-without-cdn
Add flag to skip download from the CDN, and support installing from a local file share
2018-06-08 21:15:06 -07:00
Nate McMaster
91e2612ea1
Add flag to skip download from the CDN, and support installing from a local file share 2018-06-08 16:45:21 -07:00
Livar
5e1c9e5559
Merge pull request #9423 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-06-08 09:51:03 -07:00
Livar
99603d0f49
Merge pull request #9435 from v-zbsail/loc_20180604_master
LOC CHECKIN | dotnet/cli master | 20180607
2018-06-08 09:48:56 -07:00
Zbyněk Sailer
cbaaece72c LOC CHECKIN | dotnet/cli master | 20180607 2018-06-07 18:18:34 +02:00
Livar
62d968050a
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-06 09:19:05 -07:00
Livar
0e346aa5ba
Merge pull request #9360 from SimonCropp/patch-1
Update Sha256Hasher.cs
2018-06-05 22:46:18 -07:00
Livar
670dcedba2
Merge pull request #9381 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-06-05 22:45:53 -07:00
Livar
83fa5538bc
Merge pull request #9418 from kasper3/release/2.1.4xx
Remove obsolete manpages
2018-06-05 22:45:39 -07:00
Livar
49f4a0bf5b
Merge pull request #9417 from livarcocc/fix_signing
Updating signing project to use new intermediate directory (int).
2018-06-04 15:02:27 -07:00
William Li
48ee97fb42
Merge pull request #9371 from svick/patch-4
Simplified combining dictionaries in Telemetry
2018-06-04 13:43:13 -07:00
kasper
711ff3bb25 Remove obsolete manpages 2018-06-04 20:35:32 +00:00
Livar
72ce357c9c
Merge pull request #9415 from dotnet/nuget.client.release-4.8.0.5244-1-1
Insert NuGet Build 4.8.0-preview3.5244 into cli
2018-06-04 13:08:05 -07:00
Livar Cunha
625b9d4963 Updating signing project to use new intermediate directory (int). 2018-06-04 13:06:02 -07:00
Steve Harter
f45acc5e10
Update runtimeconfig.json doc for 2.1 (#9382) 2018-06-04 14:46:13 -05:00
Livar
447bd91100
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-04 11:38:31 -07:00
Livar
77a0f99c94
Merge pull request #9392 from livarcocc/enable_2_2_runtime
Updating the build and tests to work with the 2.2.0 runtime.
2018-06-04 11:05:52 -07:00
Livar
36f1bc9da8
Merge pull request #9365 from kasper3/release/2.1.4xx
Add dotnet-tool manpages and update others
2018-06-04 10:45:12 -07:00
Livar
d36e5ce161
Merge pull request #9399 from rainersigwald/msbuild-15.8.78
MSBuild 15.8.78 (4xx)
2018-06-04 10:42:58 -07:00
NuGet Team Bot
534ae754dd Insert NuGet Build 4.8.0-preview3.5244 into cli 2018-06-04 09:47:36 -07:00
Livar Cunha
78c7f5af5b Shortening the path to the intermediate folder by renaming it to int. 2018-06-01 15:46:22 -07:00
Maira Wenzel
7ce47778b4 fix typo (#9364)
* fix typo

* add loc files
2018-06-01 14:16:41 -07:00
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -07:00
Peter Huene
780ca149a5
Merge pull request #9394 from peterhuene/revert-property-fix
Revert "Fix MSBuild invocation to quote property option values."
2018-06-01 10:43:19 -07:00
Rainer Sigwald
2db872e25d MSBuild 15.8.78 2018-06-01 09:31:48 -05:00
Peter Huene
98dd811aa8
Revert "Fix MSBuild invocation to quote property option values."
This reverts commit f9b939fe89.

That fix caused a regression that prevented a single `/property` option to
define multiple properties using the `/property:First=foo;Second=bar` syntax.

Users that want literal semicolons in the property values should use escaped
quotes around the property value, e.g. `/property:Prop='"foo;bar;baz"'`.

Fixes #9369.
2018-05-31 21:34:05 -07:00
Daniel Plaisted
c9d457a6b9
Merge pull request #9350 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-31 20:09:06 -07:00
Livar Cunha
2f0f270a73 Updating the build and tests to work with the 2.2.0 runtime. 2018-05-31 19:14:24 -07:00
Daniel Plaisted
da77c12682
Merge pull request #9386 from dsplaisted/clear-disabled-package-sources
Clear disabled package sources in generated NuGet.config
2018-05-31 16:55:52 -07:00
Livar
6a5f20f3d9
Merge pull request #9354 from dasMulli/feature/config-captialization
Change configuration completion suggestion to standard capitalization
2018-05-31 16:11:50 -07:00
Livar
a352935114
Merge pull request #9373 from AndyGerlicher/MSBuild-15.8.78
MSBuild 15.8.78
2018-05-31 16:05:35 -07:00
Daniel Plaisted
0bb66a5e28 Clear disabled package sources in generated NuGet.config
This will help prevent the repo being broken if you have the same feeds set up in your global NuGet.config but have them disabled
2018-05-31 12:04:23 -07:00
Nick Guerrera
81c7f9a3e9
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-05-31 11:59:29 -07:00
Livar
80d542b8f4
Merge pull request #9332 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-31 10:22:00 -07:00
Andy Gerlicher
29def94d78 MSBuild 15.8.78 2018-05-30 19:59:32 -07:00
Petr Onderka
139fc86dbc
Simplified combining dictionaries in Telemetry 2018-05-31 01:03:27 +02:00
kasper3
5f93685491 Add dotnet-tool manpages and update others 2018-05-30 15:52:55 +00:00
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -07:00
Sebastian Karasek
c01e7c3e42 Fix extraction of folders (#9335) 2018-05-29 11:02:26 -07:00
Simon Cropp
ca8fefb1be
Update Sha256Hasher.cs 2018-05-29 23:00:23 +10:00
dasMulli
0b1509da5c
Change completion suggestion to standard capitalization. 2018-05-27 14:50:54 +02:00
Livar
d250d075be
Merge pull request #9348 from livarcocc/update_dependencies
Update dependencies and branding
2018-05-25 14:51:18 -07:00
Livar Cunha
99462b9e7a Updating branding to 2.1.301. 2018-05-25 12:12:22 -07:00
Livar Cunha
aeae506fa8 Updating dependency versions to match prodcon. 2018-05-25 12:11:39 -07:00
Livar
de407deff0
Merge pull request #9347 from dsplaisted/update-sdk
Insert updated SDK from 2.1.4xx branch
2018-05-24 21:21:41 -07:00
William Li
983612b95b
Fix relative path tool path (#9330)
Pass full path to Path.GetRelativePath
2018-05-24 18:15:23 -07:00