Livar Cunha
e2b679c4bb
Merge branch 'master' of /Users/livarcocc/Documents/git/cli into merge_master_cli
...
* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
Updating signing project to use new intermediate directory (int).
Update runtimeconfig.json doc for 2.1 (#9382 )
Shortening the path to the intermediate folder by renaming it to int.
fix typo (#9364 )
Updating asp.net to 2.2.0 as well.
Updating the build and tests to work with the 2.2.0 runtime.
Simplified combining dictionaries in Telemetry
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362 )
Fix extraction of folders (#9335 )
Update Sha256Hasher.cs
Fix relative path tool path (#9330 )
Insert updated SDK from 2.1.4xx branch
MSBuild 15.8.60
Fix crash when user home directory cannot be determined.
Make `CliFolderPathCalculator` a static class.
Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
Add retry when Directory.Move (#9313 )
Override new SdkResult public properties
Add reference to Microsoft.Build.NuGetSdkResolver
Disable crossgen for MSBuild inline-task refs
...
2018-06-25 22:38:01 -07: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 Cunha
33c3a26880
Updating asp.net to 2.2.0 as well.
2018-06-01 13:31:03 -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
d17b088022
Insert updated SDK from 2.1.4xx branch
2018-05-24 16:29:10 -07:00
Rainer Sigwald
48eab9c572
MSBuild 15.8.60
2018-05-24 12:05:52 -05:00
Andy Gerlicher
5e794a064c
Add reference to Microsoft.Build.NuGetSdkResolver
2018-05-21 15:29:37 -07:00
Andy Gerlicher
6bed6e1943
MSBuild 15.8.61
2018-05-21 15:29:37 -07:00
Livar
7adbeb3928
Merge pull request #9259 from dotnet/nuget.client.release-4.8.0.5196-1-1
...
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-19 08:59:59 -07:00
Livar
a45bba7eb9
Merge pull request #9308 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 15:17:08 -07:00
Livar
d57435bfcd
Merge pull request #9305 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-17 11:53:21 -07:00
Livar
8829b9690e
Maintain MSBuild version at 15.7.179
2018-05-17 11:51:36 -07:00
Livar
ded465c666
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies
2018-05-17 10:37:00 -07:00
John Beisner
d7892663ea
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx
2018-05-16 14:50:13 -07:00
Jared Parsons
4d3b649efc
Fix version number
2018-05-16 11:04:16 -07:00
John Beisner
b78d591c97
Merge pull request #9284 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-16 09:04:53 -07:00
dotnet-maestro-bot
be606951b1
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, roslyn, sdk, templating, templating, templating, websdk to rtm-62915-03, rtm-62915-03, rtm-26515-03, rtm-26515-03, rtm-26515-03, rtm-180515-0, 15.7.177, beta6-62915-07, rtm-62915-10, beta3-20180515-1688254, beta3-20180515-1688254, beta3-20180515-1688254, rtm-20180515-1688249, respectively
2018-05-15 23:49:42 +00:00
Jared Parsons
4e6171401c
Consume 15.7.2 compiler
2018-05-15 12:51:40 -07:00
John Beisner
08b20ef268
Merge pull request #9275 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-15 09:17:36 -07:00
Livar
f55724c348
Merge pull request #9276 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
...
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively (release/2.1.3xx)
2018-05-14 21:25:46 -07:00
Livar
8096889442
Merge pull request #9262 from rainersigwald/msbuild-15.7.179-3xx
...
MSBuild 15.7.179
2018-05-14 09:47:06 -07:00
dotnet-maestro-bot
1fd2a6aa90
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62914-01, rtm-62914-02, rtm-26514-02, rtm-26514-02, rtm-26514-02, rtm-180513-0, beta6-62911-06, rtm-62914-01, beta3-20180513-1683966, beta3-20180513-1683966, beta3-20180513-1683966, rtm-20180513-1683962, respectively
2018-05-14 15:46:02 +00:00
Rainer Sigwald
85aba00741
MSBuild 15.7.179
2018-05-11 13:30:58 -05:00
Rainer Sigwald
98fa02ade4
MSBuild 15.7.179
2018-05-11 13:15:30 -05:00
NuGet Team Bot
f6be1b1669
Insert NuGet Build 4.8.0-preview1.5196 into cli
2018-05-11 10:36:28 -07:00
Livar
11f2843f7b
Merge pull request #9252 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-11 10:16:04 -07:00
abhishkk
b18efcea85
15.8.0-preview-20180510-03 testplatform insertion
2018-05-11 16:11:54 +05:30
Livar
4919ee2484
Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies
2018-05-09 15:42:26 -07:00
John Beisner
da7da0b018
Merge pull request #9227 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
...
Merge release/2.1.3xx to release/2.1.4xx
2018-05-09 14:06:02 -07:00
Parallels
3bbab5edbf
Updating tests to depend on -upgrade packages and also updating the versions of the runtime and asp.net to versions that have support for upgradable linux packages.
2018-05-08 18:11:54 -07:00
dotnet-maestro-bot
1a8ba89a7f
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, sdk, templating, templating, templating, websdk to rtm-62908-03, alpha-62908-03, rtm-26508-02, rtm-26508-02, rtm-26508-02, rtm-180508-0, rtm-62908-02, beta3-20180508-1667431, beta3-20180508-1667431, beta3-20180508-1667431, rtm-20180508-1667423, respectively
2018-05-09 00:31:48 +00:00
Tanner Gooding
6d6bf64f28
Merge remote-tracking branch 'dotnet/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx
2018-05-07 08:20:23 -07:00
dotnet-maestro-bot
a2f3fb835d
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to rtm-62905-02, alpha-62905-02, rtm-26505-04, rtm-26505-04, rtm-26505-04, rtm-180505-0, beta6-62904-04, rtm-62905-02, beta3-20180505-1661716, beta3-20180505-1661716, beta3-20180505-1661716, rtm-20180505-1661707, respectively
2018-05-05 20:42:19 +00:00
NuGet Team Bot
817870e977
Insert NuGet Build 4.8.0-preview1.5158 into cli
2018-05-04 10:58:07 -07:00
Tanner Gooding
a8856ddccc
Merge remote-tracking branch 'dotnet/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx
2018-05-03 15:24:39 -07:00
Livar
b1b35e4226
Update SDK to latest from 2.1.300
...
Updating to 1.0.0-rc1-62827-06. There is a bug in the SDK where we are producing packages with the wrong version.
2018-04-27 16:33:52 -07:00
jbeisner
6fcea14b78
Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC
2018-04-27 22:05:24 +00:00
Livar
70994ee6dd
Update SDK to 2.1.200-preview-62827-05
2018-04-27 14:06:19 -07:00
dotnet-maestro-bot
4009912a6e
Update clicommandlineparser, climigrate, coresetup, coresetup, fsharp, roslyn, sdk, templating, templating, templating, websdk to alpha-62823-01, alpha-62823-01, rc1-26423-06, rc1-26423-06, rtm-180422-0, beta4-62827-02, rc1-62823-01, beta3-20180422-1618305, beta3-20180422-1618305, beta3-20180422-1618305, rc1-20180422-1618307, respectively
2018-04-27 15:48:19 +00:00
jbeisner
55535c0f41
Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC
2018-04-26 22:51:04 +00:00
Livar
fc577e6b05
Update SDK to 2.1.200-preview-62826-08
2018-04-26 14:12:42 -07:00
Livar
20574d2e7b
Merge pull request #9147 from AndyGerlicher/MSBuild-15.7.177-2xx
...
MSBuild 15.7.177 (2xx)
2018-04-26 13:21:31 -07:00
Livar
af62bffb45
Merge pull request #9133 from dotnet/nuget.client.release-5148-1-1
...
Insert NuGet Build 4.7.0-rtm.5148 into cli
2018-04-26 13:21:04 -07:00
Andy Gerlicher
a4cc9fa5e0
MSBuild 15.7.177
2018-04-25 20:39:14 -07:00
jbeisner
8ff0797b10
Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC
2018-04-25 18:34:16 +00:00
Livar
a711c264f1
Update Roslyn to 2.8.0-beta4-62824-10
2018-04-24 16:00:33 -07:00
NuGet Team Bot
458ad92d49
Insert NuGet Build 4.7.0-rtm.5148 into cli
2018-04-24 14:50:13 -07:00
jbeisner
247937665f
Fix a release/2.1.3xx baseline error:
...
error NU1605: Detected package downgrade: Microsoft.NETCore.App from 2.1.0-rc1-26423-06 to 2.1.0-rc1-26420-08
2018-04-24 20:57:42 +00:00
John Beisner
754a68524a
Merge branch 'release/2.1.3xx' into FixLinuxMusl
2018-04-24 13:31:46 -07:00