nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 00:52:49 -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

2
src/Icons/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"

11
src/Icons/Icons.csproj
View File

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

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

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