Commit graph

8810 commits

Author SHA1 Message Date
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
f87c6e7d11
Merge pull request #9178 from natemcmaster/namc/disable-aspnet
Add a property to disable bundling ASP.NET Core tools and runtimes
2018-05-01 15:56:32 -07:00
Livar
e3fb6280ee
Merge pull request #9125 from dotnet-maestro-bot/release/2.1.3xx-UpdateDependencies
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 (release/2.1.3xx)
2018-05-01 15:31:56 -07:00
Nate McMaster
c382932ec4
Fix #if to match .csproj constant 2018-05-01 12:45:50 -07:00
Peter Huene
67ecb5ac65
Merge pull request #9161 from v-zbsail/loc_20180427_release_2.1.3xx
LOC CHECKIN | dotnet/cli release/2.1.3xx | 20180427
2018-05-01 11:25:45 -07:00
William Li
57d065e43d
Correct dotnet list description (#9174)
After dotnet tool list moved out of dotnet list, the description has not been updated.
2018-05-01 10:24:40 -07:00
William Li
d681933b87
Rename --source-feed to --add-source (#9164)
* Rename to add-source
2018-05-01 10:21:00 -07:00
Nate McMaster
ba68037ee6
Do not disable bundled aspnet templates
See https://github.com/dotnet/source-build/issues/456#issuecomment-385677818
2018-05-01 08:49:54 -07:00
Peter Huene
faa7a7e47c
Fix tool package unit test to use the correct resource string.
The `GivenFailedPackageInstallWhenRunWithPackageIdItShouldFail` test should
match against `ToolInstallationFailedWithRestoreGuidance` and not
`ToolInstallationFailed`.  This passed prior to the LOC update because
the former started with the latter and a "contains" match was being performed.
2018-04-30 21:49:45 -07:00
Nate McMaster
b0c5fddc04
Add a property to disable bundling ASP.NET Core tools, templates, and runtimes 2018-04-30 17:49:09 -07:00
Livar
d17f4ec94e
Merge pull request #9123 from johnbeisner/FixNupkgSigning
Mark both CLI NuPkgs as "NonShipping=true"
2018-04-30 15:26:16 -07:00
Zbyněk Sailer
47a65f258a
LOC CHECKIN | dotnet/cli release/2.1.3xx | 20180427 2018-04-30 14:50:26 -07:00
Peter Huene
b23259c30f
Merge pull request #9160 from peterhuene/fix-pid-file-share-mode
Fix Razor server shutdown on Windows.
2018-04-30 14:47:31 -07:00
Livar
78bd1cffb9
Merge pull request #9163 from dotnet/namc/aspnet-linux-arm
Include aspnetcore in the linux-arm build,
2018-04-30 14:47:07 -07:00
Peter Huene
56d8103181
Merge pull request #9137 from peterhuene/relative-sources
Fix --source-feed option for tool install and update commands.
2018-04-30 14:46:50 -07:00
Livar
234a7561a8
Merge pull request #9150 from kasper3/release/2.1.3xx
Use cp -u on linux-musl
2018-04-30 14:46:04 -07:00
Livar
d9154f7711
Merge pull request #9175 from dotnet/update_version_rtm
Update version to rtm
2018-04-30 14:43:36 -07:00
Livar
d65b6b0d06
Update version to rtm 2018-04-30 12:00:51 -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
Livar
b390c9805e
Merge pull request #9166 from dotnet/update_sdk_2xx
Update SDK to 2.1.200-preview-62827-05
2018-04-27 15:02:00 -07:00
Livar
f5e3ddbe73
Merge pull request #9167 from livarcocc/update_build_number
Empty commit for new build.
2018-04-27 14:22:09 -07:00
Livar Cunha
4719256c7a Empty commit for new build. 2018-04-27 14:16:11 -07:00
Nate McMaster
16cc6141d6
Use AspNetCoreSharedFxArchiveRid instead of AspNetCoreSharedFxInstallerRid 2018-04-27 14:14:14 -07:00
Livar
70994ee6dd
Update SDK to 2.1.200-preview-62827-05 2018-04-27 14:06:19 -07:00
Peter Huene
b2b3947c68
Fix Razor server shutdown on Windows.
On Windows, the Razor server correctly creates the pid file with
`FileAccess.Write` and `FileOptions.DeleteOnClose`.  This requires a share mode
of `FileShare.Write | FileShare.Delete` to open.  However, the
`dotnet build-server shutdown` command was opening the file with
`FileShare.Read`.  As a result, an `IOException` was being thrown and was not
handled.

This change first opens the file with the appropriate share access and also
properly handles a failure to access or read the contents of the pid file.

Additionally, an integration test was added to test that Razor server shutdown
works as expected.

Fixes #9158.
2018-04-27 13:52:17 -07:00
Nate McMaster
2b9f00f361
Include aspnetcore in the linux-arm build, but not linux-arm64 or windows arm 2018-04-27 10:33:58 -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
Livar
b794743c76
Merge pull request #9155 from dotnet/update_sdk_2xx
Update SDK to 2.1.200-preview-62826-08
2018-04-26 15:38:55 -07: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
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
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
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
jbeisner
6a26200b46 Merge remote-tracking branch 'upstream/release/2.1.3xx' into FixNupkgSigning 2018-04-24 16:06:28 +00: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