Commit graph

9246 commits

Author SHA1 Message Date
Livar
fc577e6b05
Update SDK to 2.1.200-preview-62826-08 2018-04-26 14:12:42 -07:00
Livar
ce340ce6e8
Merge pull request #9107 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
Merge release/2.1.3xx to release/2.1.4xx
2018-04-26 13:55:13 -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
kasper3
7ff4f27df1 Update readme: alpine-<ver>-targz to musl-targz 2018-04-26 16:58:49 +00:00
Matt Mitchell
04066cb5d8
Merge pull request #9146 from mmitche/make-override-explicit
Explicitly note whether the package version props is being overridden
2018-04-26 08:33:05 -07:00
kasper3
7b635e76a1
Use cp -u on linux-musl
This actually applies to all busybox based OS.
2018-04-26 14:26:35 +03:00
Andy Gerlicher
a4cc9fa5e0 MSBuild 15.7.177 2018-04-25 20:39:14 -07:00
Matt Mitchell
535cac7f55 Explicitly note whether the package version props is being overridden
It's difficult to tell today whether the package version props is correctly passed and used in some scenarios.  Make it more explicit.
2018-04-25 17:11:09 -07:00
John Beisner
14bdc6a1ba Merged PR 118861: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Merge update to release/2.1.2xx-MSRC from 'dotnet' release/2.1.2xx
2018-04-25 18:40:33 +00: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
Peter Huene
b9597913dc
Fix --source-feed option for tool install and update commands.
Commit 9cc2b7cd2f regressed the `--source-feed`
option so that it no longer accepted relative paths.  Because the option is now
saved to the temp project file, any relative paths specified by the
`--source-feed` option were made relative to the temp project path and not from
the current working directory of where dotnet was run.

The fix is to use `Path.GetFullPath` of the `--source-feed` option, provided
the option specified was not an absolute URI.

Fixes #9132.
2018-04-24 20:43:14 -07:00
Livar
4db4d9b568
Merge pull request #9130 from johnbeisner/FixLinuxMusl
Fix linux musl; CLI:release/2.1.3xx
2018-04-24 18:09:37 -07:00
Livar
e17cc69763
Merge pull request #9134 from dotnet/update_roslyn_2xx
Update Roslyn to 2.8.0-beta4-62824-10
2018-04-24 16:57:11 -07: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
Livar
355b08befd
Merge branch 'release/2.1.4xx' into merges/release/2.1.3xx-to-release/2.1.4xx 2018-04-24 14:20:28 -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
jbeisner
bb15fa8c61 Formatting... 2018-04-24 20:22:35 +00:00
jbeisner
70e3f1d30d Updating the AspNetCore version to a drop that has a 'linux-musl' asset 2018-04-24 19:51:04 +00:00
jbeisner
96674333e3 Fixing typo... 2018-04-24 19:07:33 +00:00
jbeisner
74ee6b6070 Download 'linux-musl-x64' shared framework assets when building 'linux-musl-x64' 2018-04-24 18:48:18 +00:00
John Beisner
c115d048f7 Merged PR 118577: Refresh release/2.1.2xx-MSRC with 'dotnet' release/2.1.2xx
Pulling in: https://github.com/dotnet/cli/pull/9096 and other updates to release/2.1.2xx

Please review DependencyVersions.props
2018-04-24 18:12:28 +00:00
jbeisner
36d7cdf8c1 Merge remote-tracking branch 'upstream/release/2.1.2xx' into release/2.1.2xx-MSRC 2018-04-24 17:51:56 +00:00
William Li
270fc4428a
do not set BaseIntermediateOutputPath in temp project of dotnet install (#9122)
Should use MsBuildProjectExtensionsPath instead.

Change the property passin by project file instead of command line. It is more reliable passing path in xml and also the timing of MsBuildProjectExtensionsPath is controlled. (Before loading SDK)
Change mock fake project to use “;” instead, since c:\path contains “:”.
2018-04-24 10:19:27 -07:00
jbeisner
6a26200b46 Merge remote-tracking branch 'upstream/release/2.1.3xx' into FixNupkgSigning 2018-04-24 16:06:28 +00:00
Nate McMaster
2d59528389 Merged PR 118480: Update to ASP.NET Core 2.0.8 build 10026
Update to ASP.NET Core 2.0.8 build 10026.

FYI @<Stephen Halter> - includes your latest Kestrel changes.
2018-04-24 14:54:42 +00:00
Nate McMaster
0b885eee23
Update to ASP.NET Core 2.0.8 build 10026 2018-04-23 20:02:08 -07:00
jbeisner
4dc5eb7320 Do not sign the CLI NuPkgs - they do not ship. 2018-04-23 22:03:55 +00:00
jbeisner
6d353a5963 Mark both NuPkgs as "NonShipping=true" 2018-04-23 21:56:00 +00:00
Daniel Plaisted
6ae1926fb0
Merge pull request #9097 from dotnet/johluo/implicit-app
Add bundled aspnetcore runtime framework versions
2018-04-23 13:29:29 -07:00
William Li
008e5f3d97
Remove -f short hand in dotnet tool install (#9102) 2018-04-23 13:23:35 -07:00
Nate McMaster
064879cfed Merged PR 118158: Update to ASP.NET Core 2.0.8 build 10024
Update to ASP.NET Core 2.0.8 build 10024.
2018-04-23 16:42:38 +00:00
John Luo
441a470f54 Add bundled aspnetcore runtime framework versions
- Add integration test for implicit Microsoft.AspNetCore.App versions
2018-04-23 00:33:33 -07:00
William Li
e1c8cd6350
Merge pull request #9117 from nguerrera/prodcon-fix
Unblock build
2018-04-20 17:30:51 -07:00
Nate McMaster
68add55652
Update to ASP.NET Core 2.0.8 build 10024 2018-04-20 16:52:01 -07:00
Nick Guerrera
ea08319a65 Unblock build
Test build was causing restore and build in same evaluation, which was
always incorrect, but with a recent change to sdk, it will always fail
outright instead of sometimes getting lucky enough for it not to matter.
This was therefore a breaking change and we will discuss separately how
to handle it. This takes the bad pattern out of the test build to unblock
the build.
2018-04-20 16:43:41 -07:00
Livar
53068bb65e
Merge pull request #9115 from dotnet/nuget.client.release-5122-1-1
Insert NuGet Build 4.7.0-rtm.5122 into cli
2018-04-20 16:27:19 -07:00
Livar
6d9a4f1c65
Update SDK to 2.1.200-preview-62820-08 2018-04-20 15:21:46 -07:00
Livar
9b052dc97b
Merge pull request #9116 from weshaggard/addlinuxmusl-rel
[release/2.1.3xx] Replace alpine with linux-musl builds
2018-04-20 15:14:38 -07:00
Livar
dc088918f9
Merge pull request #9106 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-04-20 15:12:18 -07:00
Wes Haggard
1e30cf3b5f Add temporary feed to boot-strap linux-musl build 2018-04-20 14:11:06 -07:00
Wes Haggard
4a59d83b5c Update the readme to the new build definition 2018-04-20 13:23:23 -07:00
Wes Haggard
a90f10f629 Update dotnet-install to select linux-musl on alpine 2018-04-20 13:23:14 -07:00
Wes Haggard
65d5730631 Replace alpine with linux-musl builds
We still build linux-musl on the alpine OS but we no longer
produce a alpine installer/tar file instead we just have the
linux-musl version.
2018-04-20 13:23:00 -07:00
NuGet Team Bot
205f58496f Insert NuGet Build 4.7.0-rtm.5122 into cli 2018-04-20 13:09:19 -07:00
Peter Huene
e1b5272540
Merge pull request #9099 from peterhuene/razor-server-discovery
Implement Razor server discovery by pid file.
2018-04-20 12:15:52 -07:00
Livar
2f3f672a15
Merge pull request #9100 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
Update clicommandlineparser, climigrate, coresetup, coresetup, coresetup, fsharp, msbuild, nugetclient, roslyn, sdk, templating, templating, templating, websdk to alpha-62819-01, alpha-62819-01, rc1-26419-02, rc1-26419-02, rc1-26419-02, rtm-180418-0, preview-000169, preview1.5116, dev-62819-05, preview3-62819-01, beta3-20180418-1607235, beta3-20180418-1607235, beta3-20180418-1607235, rc1-20180418-1607241, respectively (release/2.1.3xx)
2018-04-20 11:36:32 -07:00
Peter Huene
1ade191cb6
Implement Razor server discovery by pid file.
Previously, Razor server discovery for the `build-server shutdown` command was
implemented by invoking MSBuild on a project file in the current directory to
evaluate the path to the Razor server dll.  This was problematic since it would
only discover a single running Razor server instance and required that the user
run the `build-server shutdown` command from a specific location.

Razor's server now writes a "pid file" to a well-known location
(`~/.dotnet/pids/build`) which the command can now enumerate to discover, and
shutdown, the running Razor servers.

This commit changes the Razor server discovery to use the pid files and removes
the requirement that users need to run the command in specific directories to
work.

Fixes #9084.
2018-04-20 10:49:31 -07:00