huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update libuv package (#1577) 

- The latest libuv package has a new linux RID that should
let us remove the work around with setting the RID
in the docker file and systemd service
This commit is contained in:
David Fowler 2017-03-31 10:19:27 -07:00 committed by GitHub
parent 1bf9b057d4
commit b4cec03f65
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -5,7 +5,7 @@
<CoreFxLabsVersion>0.1.0-*</CoreFxLabsVersion> <CoreFxLabsVersion>0.1.0-*</CoreFxLabsVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion> <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
<LibUvVersion>1.9.1</LibUvVersion> <LibUvVersion>1.10.0-*</LibUvVersion>
<JsonNetVersion>9.0.1</JsonNetVersion> <JsonNetVersion>9.0.1</JsonNetVersion>
<MoqVersion>4.7.1</MoqVersion> <MoqVersion>4.7.1</MoqVersion>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion> <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>

4
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile
View File

@ -3,10 +3,6 @@ FROM microsoft/dotnet-nightly:2.0-runtime-deps
# The "container" environment variable is read by systemd. # The "container" environment variable is read by systemd.
ENV container=docker ENV container=docker
# We're copying assets from an ubuntu machine over the container make the RID
# match
ENV DOTNET_RUNTIME_ID=ubuntu.14.04-x64
# This is required by systemd and won't work without "dotnet run --privileged". # This is required by systemd and won't work without "dotnet run --privileged".
VOLUME ["/sys/fs/cgroup"] VOLUME ["/sys/fs/cgroup"]

1
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service
View File

@ -5,4 +5,3 @@ Requires=activate-kestrel.socket
ExecStart=/usr/bin/dotnet SampleApp.dll ExecStart=/usr/bin/dotnet SampleApp.dll
WorkingDirectory=/publish WorkingDirectory=/publish
NonBlocking=true NonBlocking=true
Environment="DOTNET_RUNTIME_ID=ubuntu.14.04-x64"