nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-21 03:24:31 -05:00
Code

update to aspnet 2.1.4

Browse Source
This commit is contained in:
Kyle Spearrin 2018-09-11 13:29:34 -04:00
parent 4ec5f2fdb2
commit ce309c27d4
24 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Admin/Admin.csproj
View File

@ -12,9 +12,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Admin/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

2
src/Admin/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Admin
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

3
src/Api/Api.csproj
View File

@ -15,8 +15,7 @@
<PackageReference Include="jsreport.AspNetCore" Version="1.0.1" /> <PackageReference Include="jsreport.AspNetCore" Version="1.0.1" />
<PackageReference Include="jsreport.Binary" Version="1.10.0" /> <PackageReference Include="jsreport.Binary" Version="1.10.0" />
<PackageReference Include="jsreport.Local" Version="1.1.2" /> <PackageReference Include="jsreport.Local" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Api/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

2
src/Api/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Api
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

5
src/Billing/Billing.csproj
View File

@ -13,9 +13,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Billing/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Billing
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

12
src/Core/Core.csproj
View File

@ -16,14 +16,14 @@
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" /> <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.2" />
<PackageReference Include="Microsoft.Azure.NotificationHubs" Version="2.0.0-preview2" /> <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="2.0.0-preview2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.1.2" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.1.3" />
<PackageReference Include="Quartz" Version="3.0.6" /> <PackageReference Include="Quartz" Version="3.0.6" />
<PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" /> <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" /> <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
@ -32,7 +32,7 @@
<PackageReference Include="IdentityServer4" Version="2.2.0" /> <PackageReference Include="IdentityServer4" Version="2.2.0" />
<PackageReference Include="Dapper" Version="1.50.5" /> <PackageReference Include="Dapper" Version="1.50.5" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" /> <PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />
<PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="2.1.0" />
<PackageReference Include="Braintree" Version="4.5.0" /> <PackageReference Include="Braintree" Version="4.5.0" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.2" /> <PackageReference Include="Portable.BouncyCastle" Version="1.8.2" />

3
src/Events/Events.csproj
View File

@ -9,8 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Events/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Events
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

2
src/Icons/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

3
src/Icons/Icons.csproj
View File

@ -10,8 +10,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.10" /> <PackageReference Include="AngleSharp" Version="0.9.10" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Icons/Program.cs
View File

@ -11,8 +11,6 @@ namespace Bit.Icons
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

2
src/Identity/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

3
src/Identity/Identity.csproj
View File

@ -14,8 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Identity/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Identity
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

2
src/Notifications/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

3
src/Notifications/Notifications.csproj
View File

@ -8,8 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.3" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.0.3" />
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.0-preview1-10015" /> <PackageReference Include="Microsoft.Azure.SignalR" Version="1.0.0-preview1-10015" />
</ItemGroup> </ItemGroup>

2
src/Notifications/Program.cs
View File

@ -10,8 +10,6 @@ namespace Bit.Notifications
WebHost WebHost
.CreateDefaultBuilder(args) .CreateDefaultBuilder(args)
.UseStartup<Startup>() .UseStartup<Startup>()
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv()
.Build() .Build()
.Run(); .Run();
} }

2
util/Server/Dockerfile
View File

@ -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" LABEL com.bitwarden.product="bitwarden"

4
util/Server/Program.cs
View File

@ -14,9 +14,7 @@ namespace Bit.Server
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.UseConfiguration(config) .UseConfiguration(config)
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>();
// ref: https://github.com/aspnet/KestrelHttpServer/issues/2694
.UseLibuv();
var contentRoot = config.GetValue<string>("contentRoot"); var contentRoot = config.GetValue<string>("contentRoot");
if(string.IsNullOrWhiteSpace(contentRoot)) if(string.IsNullOrWhiteSpace(contentRoot))

3
util/Server/Server.csproj
View File

@ -7,8 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.1.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
util/Setup/Dockerfile
View File

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1.2-runtime FROM microsoft/dotnet:2.1.4-runtime
LABEL com.bitwarden.product="bitwarden" LABEL com.bitwarden.product="bitwarden"