Commit graph

2125 commits

Author SHA1 Message Date
Livar
62d968050a
Merge branch 'master' into merges/release/2.1.4xx-to-master 2018-06-06 09:19:05 -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 Cunha
625b9d4963 Updating signing project to use new intermediate directory (int). 2018-06-04 13:06:02 -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
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
Livar Cunha
33c3a26880 Updating asp.net to 2.2.0 as well. 2018-06-01 13:31:03 -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
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
John Beisner
dae5099ffb
Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (#9362) 2018-05-29 13:46:07 -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
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
John Beisner
468116f9f2
Merge pull request #9331 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-05-24 09:30:28 -07:00
Livar Cunha
6dfa6af7d6 Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true. 2018-05-22 10:45:11 -07: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
John Beisner
6f185432d4
Merge pull request #9317 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-21 09:24:20 -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
John Beisner
da34f7eaab
Merge pull request #9312 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 20:25:26 -07:00
Livar
c921ea92b8
Merge pull request #9309 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 15:17:50 -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
e338e46e10
Merge pull request #9306 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-17 13:41:23 -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
Livar
f23377b19f
Merge pull request #9299 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 10:35:31 -07:00
Livar
484a1f6743
Merge pull request #9298 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-05-17 10:34:38 -07:00
Livar Cunha
491ec16307 Add the NoWarn option when producing Cli.Utils for full framework as well. 2018-05-16 15:33:19 -07:00
John Beisner
508f902ed0
Merge pull request #9296 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 14:52:29 -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
Livar Cunha
2531e3a136 Add NoWarn for the stable package depending on non-stable package when packaging Cli.Utils for tests. 2018-05-16 12:44:23 -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
John Beisner
baeb21728d
Merge pull request #9285 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-16 09:00:04 -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
Matt Mitchell
1aae04f316 Accept DropSuffix as a boolean 2018-05-14 13:43:09 -07:00
Livar
69062dda4e
Merge pull request #9266 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2018-05-14 09:47:53 -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