1
0
mirror of https://github.com/bitwarden/server synced 2026-01-09 20:13:24 +00:00

update to .net / asp.net 2.1

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

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"

View File

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

View File

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

View File

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