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 .net / asp.net 2.1

pull/335/head
Kyle Spearrin 7 years ago
parent
0685023e1d
commit
61cda87574
28 changed files with 79 additions and 120 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. 8
      README.md
  2. 13
      src/Admin/Admin.csproj
  3. 2
      src/Admin/Dockerfile
  4. 4
      src/Admin/build.ps1
  5. 4
      src/Admin/build.sh
  6. 19
      src/Api/Api.csproj
  7. 2
      src/Api/Dockerfile
  8. 8
      src/Api/build.ps1
  9. 8
      src/Api/build.sh
  10. 10
      src/Billing/Billing.csproj
  11. 20
      src/Core/Core.csproj
  12. 11
      src/Events/Events.csproj
  13. 2
      src/Icons/Dockerfile
  14. 11
      src/Icons/Icons.csproj
  15. 4
      src/Icons/build.ps1
  16. 4
      src/Icons/build.sh
  17. 2
      src/Identity/Dockerfile
  18. 11
      src/Identity/Identity.csproj
  19. 4
      src/Identity/build.ps1
  20. 4
      src/Identity/build.sh
  21. 12
      src/Jobs/Jobs.csproj
  22. 8
      util/Mail/Mail.csproj
  23. 2
      util/Server/Dockerfile
  24. 10
      util/Server/Server.csproj
  25. 2
      util/Setup/Dockerfile
  26. 6
      util/Setup/Setup.csproj
  27. 4
      util/Setup/build.ps1
  28. 4
      util/Setup/build.sh

8
README.md
Unescape View File

@ -40,8 +40,8 @@ The core infrastructure is written in C# using .NET Core with ASP.NET Core. The @@ -40,8 +40,8 @@ The core infrastructure is written in C# using .NET Core with ASP.NET Core. The
```
cd src/Api
dotnet restore
dotnet build -f netcoreapp2.0
dotnet run -f netcoreapp2.0
dotnet build -f netcoreapp2.1
dotnet run -f netcoreapp2.1
```
visit http://localhost:5000/alive
@ -51,8 +51,8 @@ visit http://localhost:5000/alive @@ -51,8 +51,8 @@ visit http://localhost:5000/alive
```
cd src/Identity
dotnet restore
dotnet build -f netcoreapp2.0
dotnet run -f netcoreapp2.0
dotnet build -f netcoreapp2.1
dotnet run -f netcoreapp2.1
```
visit http://localhost:33657/.well-known/openid-configuration

13
src/Admin/Admin.csproj
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Billing</RootNamespace>
<UserSecretsId>bitwarden-Admin</UserSecretsId>
</PropertyGroup>
@ -12,13 +12,8 @@ @@ -12,13 +12,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
</ItemGroup>
</Project>

2
src/Admin/Dockerfile
Unescape View File

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

4
src/Admin/build.ps1
Unescape View File

@ -5,12 +5,12 @@ echo "`n## Building Admin" @@ -5,12 +5,12 @@ echo "`n## Building Admin"
echo "`nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $dir\Admin.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet clean $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "Node Build"
npm --prefix $dir install $dir
gulp --gulpfile $dir\gulpfile.js build
echo "Publish"
dotnet publish $dir\Admin.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet publish $dir\Admin.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "`nBuilding docker image"
docker --version

4
src/Admin/build.sh
Unescape View File

@ -8,12 +8,12 @@ echo -e "\n## Building Admin" @@ -8,12 +8,12 @@ echo -e "\n## Building Admin"
echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet clean $DIR/Admin.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo "Node Build"
npm --prefix $DIR install $DIR
gulp --gulpfile $DIR/gulpfile.js build
echo "Publish"
dotnet publish $DIR/Admin.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet publish $DIR/Admin.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo -e "\nBuilding docker image"
docker --version

19
src/Api/Api.csproj
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
<RootNamespace>Bit.Api</RootNamespace>
<UserSecretsId>bitwarden-Api</UserSecretsId>
</PropertyGroup>
@ -15,18 +15,13 @@ @@ -15,18 +15,13 @@
<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" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

2
src/Api/Dockerfile
Unescape View File

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

8
src/Api/build.ps1
Unescape View File

@ -5,11 +5,11 @@ echo "`n## Building API" @@ -5,11 +5,11 @@ echo "`n## Building API"
echo "`nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $dir\Api.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Api
dotnet clean $dir\..\Jobs\Jobs.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Jobs
dotnet clean $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
dotnet clean $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
echo "Publish"
dotnet publish $dir\Api.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Api
dotnet publish $dir\..\Jobs\Jobs.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish\Jobs
dotnet publish $dir\Api.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Api
dotnet publish $dir\..\Jobs\Jobs.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish\Jobs
echo "`nBuilding docker image"
docker --version

8
src/Api/build.sh
Unescape View File

@ -8,11 +8,11 @@ echo -e "\n## Building API" @@ -8,11 +8,11 @@ echo -e "\n## Building API"
echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Api.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Api
dotnet clean $DIR/../Jobs/Jobs.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Jobs
dotnet clean $DIR/Api.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Api
dotnet clean $DIR/../Jobs/Jobs.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Jobs
echo "Publish"
dotnet publish $DIR/Api.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Api
dotnet publish $DIR/../Jobs/Jobs.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish/Jobs
dotnet publish $DIR/Api.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Api
dotnet publish $DIR/../Jobs/Jobs.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish/Jobs
echo -e "\nBuilding docker image"
docker --version

10
src/Billing/Billing.csproj
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Billing</RootNamespace>
<UserSecretsId>bitwarden-Billing</UserSecretsId>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@ -13,12 +13,8 @@ @@ -13,12 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
</ItemGroup>
<ItemGroup>

20
src/Core/Core.csproj
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
<RootNamespace>Bit.Core</RootNamespace>
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
</PropertyGroup>
@ -63,15 +63,15 @@ @@ -63,15 +63,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.0.2" />
<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.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="Serilog.Extensions.Logging" Version="2.0.2" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" />

11
src/Events/Events.csproj
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Events</RootNamespace>
<UserSecretsId>bitwarden-Events</UserSecretsId>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@ -10,12 +10,7 @@ @@ -10,12 +10,7 @@
<ItemGroup>
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
</ItemGroup>
<ItemGroup>

2
src/Icons/Dockerfile
Unescape View File

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

11
src/Icons/Icons.csproj
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Icons</RootNamespace>
<UserSecretsId>bitwarden-Icons</UserSecretsId>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@ -10,12 +10,7 @@ @@ -10,12 +10,7 @@
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.10" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
</ItemGroup>
<ItemGroup>

4
src/Icons/build.ps1
Unescape View File

@ -5,9 +5,9 @@ echo "`n## Building Icons" @@ -5,9 +5,9 @@ echo "`n## Building Icons"
echo "`nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet clean $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "Publish"
dotnet publish $dir\Icons.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet publish $dir\Icons.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "`nBuilding docker image"
docker --version

4
src/Icons/build.sh
Unescape View File

@ -8,9 +8,9 @@ echo -e "\n## Building Icons" @@ -8,9 +8,9 @@ echo -e "\n## Building Icons"
echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet clean $DIR/Icons.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo "Publish"
dotnet publish $DIR/Icons.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet publish $DIR/Icons.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo -e "\nBuilding docker image"
docker --version

2
src/Identity/Dockerfile
Unescape View File

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

11
src/Identity/Identity.csproj
Unescape View File

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>1.22.0</Version>
<TargetFrameworks>netcoreapp2.0;net471</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net471</TargetFrameworks>
<RootNamespace>Bit.Identity</RootNamespace>
<UserSecretsId>bitwarden-Identity</UserSecretsId>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
@ -14,13 +14,8 @@ @@ -14,13 +14,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.2" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" />
</ItemGroup>
</Project>

4
src/Identity/build.ps1
Unescape View File

@ -5,9 +5,9 @@ echo "`n## Building Identity" @@ -5,9 +5,9 @@ echo "`n## Building Identity"
echo "`nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $dir\Identity.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet clean $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "Publish"
dotnet publish $dir\Identity.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet publish $dir\Identity.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "`nBuilding docker image"
docker --version

4
src/Identity/build.sh
Unescape View File

@ -8,9 +8,9 @@ echo -e "\n## Building Identity" @@ -8,9 +8,9 @@ echo -e "\n## Building Identity"
echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Identity.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet clean $DIR/Identity.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo "Publish"
dotnet publish $DIR/Identity.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet publish $DIR/Identity.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo -e "\nBuilding docker image"
docker --version

12
src/Jobs/Jobs.csproj
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Jobs</RootNamespace>
<UserSecretsId>bitwarden-Jobs</UserSecretsId>
</PropertyGroup>
@ -14,16 +14,12 @@ @@ -14,16 +14,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
</ItemGroup>
</Project>

8
util/Mail/Mail.csproj
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Bit.Mail</RootNamespace>
</PropertyGroup>
@ -12,11 +12,7 @@ @@ -12,11 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
</ItemGroup>
</Project>

2
util/Server/Dockerfile
Unescape View File

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

10
util/Server/Server.csproj
Unescape View File

@ -1,17 +1,13 @@ @@ -1,17 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
<RootNamespace>Bit.Server</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
</ItemGroup>
</Project>

2
util/Setup/Dockerfile
Unescape View File

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

6
util/Setup/Setup.csproj
Unescape View File

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<NoWarn>1701;1702;1705;NU1701</NoWarn>
<RootNamespace>Bit.Setup</RootNamespace>
</PropertyGroup>
@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="dbup" Version="3.3.5" />
</ItemGroup>

4
util/Setup/build.ps1
Unescape View File

@ -5,9 +5,9 @@ echo "`n## Building Setup" @@ -5,9 +5,9 @@ echo "`n## Building Setup"
echo "`nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $dir\Setup.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet clean $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "Publish"
dotnet publish $dir\Setup.csproj -f netcoreapp2.0 -c "Release" -o $dir\obj\Docker\publish
dotnet publish $dir\Setup.csproj -f netcoreapp2.1 -c "Release" -o $dir\obj\Docker\publish
echo "`nBuilding docker image"
docker --version

4
util/Setup/build.sh
Unescape View File

@ -8,9 +8,9 @@ echo -e "\n## Building Setup" @@ -8,9 +8,9 @@ echo -e "\n## Building Setup"
echo -e "\nBuilding app"
echo ".NET Core version $(dotnet --version)"
echo "Clean"
dotnet clean $DIR/Setup.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet clean $DIR/Setup.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo "Publish"
dotnet publish $DIR/Setup.csproj -f netcoreapp2.0 -c "Release" -o $DIR/obj/Docker/publish
dotnet publish $DIR/Setup.csproj -f netcoreapp2.1 -c "Release" -o $DIR/obj/Docker/publish
echo -e "\nBuilding docker image"
docker --version

Write Preview
Loading…
Cancel
Save