nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

update to .net / asp.net 2.1

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-01 10:07:20 -04:00
parent 0685023e1d
commit 61cda87574
28 changed files with 79 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/Mail/Mail.csproj
View File

@ -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 @@
</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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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 @@
</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
View File

@ -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
View File

@ -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