GitHub-Bitwarden
/
server
mirror of https://github.com/bitwarden/server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update to aspnet 2.1.4

pull/358/head
Kyle Spearrin 7 years ago
parent
4ec5f2fdb2
commit
ce309c27d4
24 changed files with 24 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/Admin/Admin.csproj
  2. 2
      src/Admin/Dockerfile
  3. 2
      src/Admin/Program.cs
  4. 3
      src/Api/Api.csproj
  5. 2
      src/Api/Dockerfile
  6. 2
      src/Api/Program.cs
  7. 5
      src/Billing/Billing.csproj
  8. 2
      src/Billing/Program.cs
  9. 12
      src/Core/Core.csproj
  10. 3
      src/Events/Events.csproj
  11. 2
      src/Events/Program.cs
  12. 2
      src/Icons/Dockerfile
  13. 3
      src/Icons/Icons.csproj
  14. 2
      src/Icons/Program.cs
  15. 2
      src/Identity/Dockerfile
  16. 3
      src/Identity/Identity.csproj
  17. 2
      src/Identity/Program.cs
  18. 2
      src/Notifications/Dockerfile
  19. 3
      src/Notifications/Notifications.csproj
  20. 2
      src/Notifications/Program.cs
  21. 2
      util/Server/Dockerfile
  22. 4
      util/Server/Program.cs
  23. 3
      util/Server/Server.csproj
  24. 2
      util/Setup/Dockerfile

5
src/Admin/Admin.csproj
Unescape View File

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

2
src/Admin/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

2
src/Admin/Program.cs
Unescape View File

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

3
src/Api/Api.csproj
Unescape View File

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

2
src/Api/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

2
src/Api/Program.cs
Unescape View File

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

5
src/Billing/Billing.csproj
Unescape View File

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

2
src/Billing/Program.cs
Unescape View File

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

12
src/Core/Core.csproj
Unescape View File

@ -16,14 +16,14 @@ @@ -16,14 +16,14 @@
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" 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.Authentication.JwtBearer" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.2" />
<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.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="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
<PackageReference Include="IdentityServer4" Version="2.2.0" />
<PackageReference Include="Dapper" Version="1.50.5" />
<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="Braintree" Version="4.5.0" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.2" />

3
src/Events/Events.csproj
Unescape View File

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

2
src/Events/Program.cs
Unescape View File

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

2
src/Icons/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

3
src/Icons/Icons.csproj
Unescape View File

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

2
src/Icons/Program.cs
Unescape View File

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

2
src/Identity/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

3
src/Identity/Identity.csproj
Unescape View File

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

2
src/Identity/Program.cs
Unescape View File

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

2
src/Notifications/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

3
src/Notifications/Notifications.csproj
Unescape View File

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

2
src/Notifications/Program.cs
Unescape View File

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

2
util/Server/Dockerfile
Unescape View File

@ -1,4 +1,4 @@ @@ -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"

4
util/Server/Program.cs
Unescape View File

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

3
util/Server/Server.csproj
Unescape View File

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

2
util/Setup/Dockerfile
Unescape View File

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

Write Preview
Loading…
Cancel
Save