update to dotnet 6.0 (#148) (#150)

master
h44z 3 months ago committed by GitHub
parent 960894cff4
commit b819fe0c7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      build.sh
  2. 2
      src/bitBetter/Dockerfile
  3. 2
      src/bitBetter/bitBetter.csproj
  4. 4
      src/licenseGen/Dockerfile
  5. 2
      src/licenseGen/licenseGen.csproj

@ -13,7 +13,7 @@ echo "Building BitBetter for BitWarden version $BW_VERSION"
cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/.keys"
docker run --rm -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/sdk:5.0 sh build.sh
docker run --rm -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/sdk:6.0 sh build.sh
docker build --no-cache --build-arg BITWARDEN_TAG=bitwarden/api:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/api "$DIR/src/bitBetter" # --squash
docker build --no-cache --build-arg BITWARDEN_TAG=bitwarden/identity:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/identity "$DIR/src/bitBetter" # --squash

@ -1,7 +1,7 @@
ARG BITWARDEN_TAG
FROM ${BITWARDEN_TAG}
COPY bin/Debug/netcoreapp5.0/publish/* /bitBetter/
COPY bin/Debug/netcoreapp6.0/publish/* /bitBetter/
COPY ./.keys/cert.cert /newLicensing.cer
RUN set -e; set -x; \

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp5.0</TargetFramework>
<TargetFramework>netcoreapp6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:5.0 as build
FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
WORKDIR /licenseGen
@ -12,6 +12,6 @@ RUN set -e; set -x; \
FROM bitbetter/api
COPY --from=build /licenseGen/bin/Debug/netcoreapp5.0/publish/* /app/
COPY --from=build /licenseGen/bin/Debug/netcoreapp6.0/publish/* /app/
ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--cert", "/cert.pfx" ]

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp5.0</TargetFramework>
<TargetFramework>netcoreapp6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

Loading…
Cancel
Save