From ce309c27d485ce2a4c37b2782dbe68d992e2593e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 11 Sep 2018 13:29:34 -0400 Subject: [PATCH] update to aspnet 2.1.4 --- src/Admin/Admin.csproj | 5 ++--- src/Admin/Dockerfile | 2 +- src/Admin/Program.cs | 2 -- src/Api/Api.csproj | 3 +-- src/Api/Dockerfile | 2 +- src/Api/Program.cs | 2 -- src/Billing/Billing.csproj | 5 ++--- src/Billing/Program.cs | 2 -- src/Core/Core.csproj | 12 ++++++------ src/Events/Events.csproj | 3 +-- src/Events/Program.cs | 2 -- src/Icons/Dockerfile | 2 +- src/Icons/Icons.csproj | 3 +-- src/Icons/Program.cs | 2 -- src/Identity/Dockerfile | 2 +- src/Identity/Identity.csproj | 3 +-- src/Identity/Program.cs | 2 -- src/Notifications/Dockerfile | 2 +- src/Notifications/Notifications.csproj | 3 +-- src/Notifications/Program.cs | 2 -- util/Server/Dockerfile | 2 +- util/Server/Program.cs | 4 +--- util/Server/Server.csproj | 3 +-- util/Setup/Dockerfile | 2 +- 24 files changed, 24 insertions(+), 48 deletions(-) diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj index b0039872c4..fd932b6bb3 100644 --- a/src/Admin/Admin.csproj +++ b/src/Admin/Admin.csproj @@ -12,9 +12,8 @@ - - - + + diff --git a/src/Admin/Dockerfile b/src/Admin/Dockerfile index 904b4a67b6..cbdc898837 100644 --- a/src/Admin/Dockerfile +++ b/src/Admin/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/src/Admin/Program.cs b/src/Admin/Program.cs index 618fbdca67..0f2e22083a 100644 --- a/src/Admin/Program.cs +++ b/src/Admin/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Admin WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index 4f9080f844..3944184056 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -15,8 +15,7 @@ - - + diff --git a/src/Api/Dockerfile b/src/Api/Dockerfile index 724f5371f6..5107da3d5d 100644 --- a/src/Api/Dockerfile +++ b/src/Api/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/src/Api/Program.cs b/src/Api/Program.cs index f26c496c83..083713695c 100644 --- a/src/Api/Program.cs +++ b/src/Api/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Api WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj index 105e7851ed..31692aa7d7 100644 --- a/src/Billing/Billing.csproj +++ b/src/Billing/Billing.csproj @@ -13,9 +13,8 @@ - - - + + diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs index b3b27ac9e6..e2a33eac68 100644 --- a/src/Billing/Program.cs +++ b/src/Billing/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Billing WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 7973e4099c..36c56ad013 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -16,14 +16,14 @@ - - - - + + + + - + @@ -32,7 +32,7 @@ - + diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj index 6fe6126b70..4c2be5ae3c 100644 --- a/src/Events/Events.csproj +++ b/src/Events/Events.csproj @@ -9,8 +9,7 @@ - - + diff --git a/src/Events/Program.cs b/src/Events/Program.cs index ecaf32a44c..e804c86ce8 100644 --- a/src/Events/Program.cs +++ b/src/Events/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Events WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Icons/Dockerfile b/src/Icons/Dockerfile index 904b4a67b6..cbdc898837 100644 --- a/src/Icons/Dockerfile +++ b/src/Icons/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj index a0a42f3a26..3f82ac2e0e 100644 --- a/src/Icons/Icons.csproj +++ b/src/Icons/Icons.csproj @@ -10,8 +10,7 @@ - - + diff --git a/src/Icons/Program.cs b/src/Icons/Program.cs index cb14564250..5b098f95bc 100644 --- a/src/Icons/Program.cs +++ b/src/Icons/Program.cs @@ -11,8 +11,6 @@ namespace Bit.Icons WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Identity/Dockerfile b/src/Identity/Dockerfile index 904b4a67b6..cbdc898837 100644 --- a/src/Identity/Dockerfile +++ b/src/Identity/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj index 3d0274c31a..87227c9c8c 100644 --- a/src/Identity/Identity.csproj +++ b/src/Identity/Identity.csproj @@ -14,8 +14,7 @@ - - + diff --git a/src/Identity/Program.cs b/src/Identity/Program.cs index 9b9d3d86be..5e1912f3eb 100644 --- a/src/Identity/Program.cs +++ b/src/Identity/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Identity WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/src/Notifications/Dockerfile b/src/Notifications/Dockerfile index 904b4a67b6..cbdc898837 100644 --- a/src/Notifications/Dockerfile +++ b/src/Notifications/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj index c191b05986..2da245fb50 100644 --- a/src/Notifications/Notifications.csproj +++ b/src/Notifications/Notifications.csproj @@ -8,8 +8,7 @@ - - + diff --git a/src/Notifications/Program.cs b/src/Notifications/Program.cs index f1a2db78d5..a0d0401c59 100644 --- a/src/Notifications/Program.cs +++ b/src/Notifications/Program.cs @@ -10,8 +10,6 @@ namespace Bit.Notifications WebHost .CreateDefaultBuilder(args) .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv() .Build() .Run(); } diff --git a/util/Server/Dockerfile b/util/Server/Dockerfile index 1473a2e09f..ad5f6b067e 100644 --- a/util/Server/Dockerfile +++ b/util/Server/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-aspnetcore-runtime +FROM microsoft/dotnet:2.1.4-aspnetcore-runtime LABEL com.bitwarden.product="bitwarden" diff --git a/util/Server/Program.cs b/util/Server/Program.cs index d76dfe4a6b..fa5339a4e1 100644 --- a/util/Server/Program.cs +++ b/util/Server/Program.cs @@ -14,9 +14,7 @@ namespace Bit.Server var builder = new WebHostBuilder() .UseConfiguration(config) .UseKestrel() - .UseStartup() - // ref: https://github.com/aspnet/KestrelHttpServer/issues/2694 - .UseLibuv(); + .UseStartup(); var contentRoot = config.GetValue("contentRoot"); if(string.IsNullOrWhiteSpace(contentRoot)) diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj index 5beb847ff1..5163465874 100644 --- a/util/Server/Server.csproj +++ b/util/Server/Server.csproj @@ -7,8 +7,7 @@ - - + diff --git a/util/Setup/Dockerfile b/util/Setup/Dockerfile index b0b7a58d24..e707aeafad 100644 --- a/util/Setup/Dockerfile +++ b/util/Setup/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.2-runtime +FROM microsoft/dotnet:2.1.4-runtime LABEL com.bitwarden.product="bitwarden"