Commit graph

9246 commits

Author SHA1 Message Date
Livar
2a1f1c6d30
Merge pull request #9551 from dotnet/update_asp_net_versions
Updates asp.net versions to match prodcon
2018-06-25 15:55:06 -07:00
Nikolche Kolev
c7cf8a55b8 Add DOTNET_HOST_PATH for dotnet nuget commands 2018-06-25 14:15:24 -07:00
Livar
2fed1c07ba Updates asp.net versions to match prodcon
Fixes https://github.com/dotnet/cli/issues/9550
2018-06-25 13:34:59 -07:00
Livar
b8735c396c
Merge pull request #9543 from AndyGerlicher/MSBuild-15.8.125
MSBuild 15.8.125
2018-06-25 12:00:29 -07:00
William Li
34fd28a3ba
Use blob feed instead of myget (#9546) 2018-06-25 10:37:19 -07:00
John Beisner
741512d065
Merge pull request #9540 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-25 09:23:51 -07:00
William Li
5218c4bcf5
Pass BaseIntermediateOutputPath via xml (#9509)
Instead of command line to avoid escaping problem.

It can support most of the character including surrogate char. It cannot
support semicolon. However, semicolon is not allow to be part of the
user name.

Port 2.1.4xx fix 0251f677ede571b61a47ca24f38df8e09038277d while keep
BaseIntermediateOutputPath instead of MsBuildProjectExtensionsPath to
minimize the change.
2018-06-24 11:32:44 -07:00
jbeisner
befc400ba8 Merge remote-tracking branch 'origin/release/2.1.3xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-22 20:48:42 +00:00
John Beisner
dc2443ca74
Fix the CI legs; CLI:release/2.1.3xx (#9535)
* Linux-musl command should be derived from "baseShellBuildCommand" not "buildCommand"; setting 'DropSuffix' in the environment.
2018-06-22 13:45:53 -07:00
Andy Gerlicher
50c5a5e110 MSBuild 15.8.125-preview 2018-06-22 10:45:22 -07:00
William Li
488edfad3f
Use correct nuget version normalized format (#9525)
* Use correct nuget version normalized format

* Change test accordingly

This matches nuget behavior
if restore with  `<PackageReference Include="global.tool.console.demo" Version="1.0.*" />` there is no warning
and if restore with `<PackageReference Include="global.tool.console.demo" Version="1.0.0" />` there is warning due to no exact 1.0.0 find
2018-06-21 13:00:49 -07:00
John Beisner
f882376933
Adding 'NoSuffix' legs to the CI (#9502)
* Adding 'NoSuffix' legs to the CI

* Fixing typo...

* Updates per code review...

* "openSUSE 43.2" should be "openSUSE 42.3"; fixing 'netci.groovy' command formation logic.
2018-06-21 12:00:28 -07:00
Livar
4757e52adb
Merge pull request #9524 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-21 10:53:38 -07:00
Livar
2bc587a615
Merge pull request #9496 from mlorbetske/dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02
Update templates to carry test SDK 15.8.0-preview-20180610-02
2018-06-21 10:49:32 -07:00
Livar
52ee655dbe
Merge pull request #9529 from KevinRansom/alignFSharpWithDev158
Align f# with dev15.8
2018-06-21 10:42:31 -07:00
William Li
7d94dbbd99
Test and automatic Update default package version and re-enable Latest package version test (#9507)
* Add Compute UseBundledNETCoreAppPackageVersionAsDefaultNetCorePatchVersion

* Add tests to catch DefaultNetCorePatchVersion moving

* Update LatestPatchVersionForNetCore2_0 to 2.0.9, it is in the process of shipping

* Update LatestPatchVersionForNetCore1_0 and LatestPatchVersionForNetCore1_1
2018-06-21 10:40:44 -07:00
Kevin Ransom
f0e0e9d51e Align F# with VS2017.8 2018-06-21 00:10:41 -07:00
John Luo
816173b6ae Merged PR 129095: Update to aspnet 2.0.9-rtm-10030 2018-06-20 23:50:59 +00:00
John Luo
dc2fefdc99 Update to aspnet 2.0.9-rtm-10030 2018-06-20 16:47:45 -07:00
Daniel Plaisted
189e90e18d
Merge pull request #9505 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-06-20 16:42:04 -07:00
Nikolche Kolev
c172433ce7 add '.' period to the command description 2018-06-20 16:40:27 -07:00
Nikolche Kolev
9cd006f591 make the interactive switch not implicit 2018-06-20 15:53:33 -07:00
Nikolche Kolev
b23c372077 fix add package parsing 2018-06-20 15:17:19 -07:00
Livar
5a3e9963f7
Merge pull request #9484 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-06-20 15:15:30 -07:00
Livar
12a1388160
Merge pull request #9494 from dotnet/nuget.client.release-4.8.0.5278-1-1
Insert NuGet Build 4.8.0-preview3.5278 into cli
2018-06-20 15:14:16 -07:00
Livar
d082ff1797
Merge pull request #9521 from livarcocc/fix_sln_string
Fix remove sln description.
2018-06-20 15:13:06 -07:00
jbeisner
4402dfb684 Revert "Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx"
This reverts commit 40be59f753, reversing
changes made to 734a41730a.
2018-06-20 22:11:00 +00:00
jbeisner
40be59f753 Merge remote-tracking branch 'origin/release/2.1.2xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-06-20 22:01:12 +00:00
Will Godbe
07241a3fe0 Merged PR 129043: Bump runtime versions to 2.0.9 stable 2018-06-20 21:45:26 +00:00
wtgodbe
e46c410acc Bump runtime versions to 2.0.9 stable 2018-06-20 14:36:27 -07:00
Livar Cunha
d6fb69a4be Fix remove sln description. 2018-06-20 10:26:43 -07:00
John Beisner
6afa092018
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-06-20 08:43:05 -07:00
Nikolche Kolev
dba0aa33da Update the messages per the recommendation 2018-06-19 16:33:59 -07:00
Mike Lorbetske
ad47c91c75
Merge branch 'release/2.1.4xx' into dev/mlorbe/UpdateTestTemplatesToSdk15.8.0-preview-20180610-02 2018-06-19 13:13:41 -07:00
Daniel Plaisted
d3787295e2
Merge pull request #9492 from dotnet/vramak/UpdateWebSdkVersion
Updating the WebSdk version for release/2.1.4xx
2018-06-18 11:37:33 -07:00
vramak
81996f47e8 Updating the websdk feed 2018-06-15 15:21:11 -07:00
Mike Lorbetske
cec0b5998e Switch back to the older version of the template package and add the templating MyGet feed 2018-06-15 15:18:30 -07:00
Mike Lorbetske
470370ab76 Bump to a newer package version built by prodcon 2018-06-15 14:44:22 -07:00
Daniel Plaisted
90fc9fb59f
Merge pull request #9473 from dsplaisted/update-vs-insertion-package-name
Update VS insertion package name
2018-06-15 13:15:29 -07:00
Nate McMaster
3601d6eb5e Merged PR 127892: [2.1.2xx-MSRC]: Update to aspnet 2.0.9-rtm-10029
Expect at least one more update as this is not the final build (it depends on .NET Core 2.0.9-servicing-26612-03)

FYI - @<John Luo> @<mgirgin>
2018-06-15 18:05:22 +00:00
Livar Cunha
cfc9d947b4 Merged PR 128266: Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
2018-06-15 17:46:15 +00:00
William Li
f3f43a7db4
Update SDK to 2.1.400-preview-63014-01 (#9498) 2018-06-15 10:36:47 -07:00
Livar Cunha
bdcc3b4c87 Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1. 2018-06-15 10:33:54 -07:00
William Li
f66dc4e08b
Merge pull request #9460 from peterhuene/fx-dep-apphost
Implement `mode` option for `dotnet publish`.
2018-06-15 09:40:19 -07:00
Livar
3818426392
Merge pull request #9475 from AndyGerlicher/MSBuild-15.8.101
MSBuild 15.8.101
2018-06-15 09:24:55 -07:00
John Beisner
f97e9e82e9 Merged PR 128197: Recent fixes; merge release/2.1.3xx into release/2.1.3xx-MSRC
Including in this merge:

https://github.com/dotnet/cli/pull/9495
The "pack" command under 'buildCrossTargeting' for 'Microsoft.DotNet.MSBuildSdkResolver' now throws a "NU5104" warning/error because the SDK stage0 was changed to "2.1.300" [change was intended].
Impact: package failure for Linux-x64, Linux-arm, and Linux-arm64

https://github.com/dotnet/cli/pull/9491
The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'
Impact: RazorApp test failure in all legs except for Linux-arm and Linux-arm64
2018-06-15 00:47:08 +00:00
John Beisner
734a41730a
Fix the 'Microsoft.AspNet.Core.Mvc' versioning (#9491)
* The version of 'Microsoft.AspNetCore.Mvc' should be independent of 'Microsoft.AspNetCore.All'

* Changing "MicrosoftAspNetCoreMvcVersion" to "MicrosoftAspNetCoreMvcPackageVersion" in order to be compatable with ProdCon.
2018-06-14 17:32:24 -07:00
Matt Mitchell
612c9c87bb
Merge pull request #9495 from johnbeisner/AddBackNoWarn
Add global NoWarn for: 'NU5104'
2018-06-14 15:11:33 -07:00
jbeisner
c0c445be04 Updating the 'NoWarn' comments. 2018-06-14 21:12:46 +00:00
Mike Lorbetske
d396c8bf4e Update templates to carry test SDK 15.8.0-preview-20180610-02 2018-06-14 13:41:15 -07:00