Skip to content

Commit a47fef7

Browse files
committed
Merge branch 'main' into 691
2 parents 53c35ce + 6789418 commit a47fef7

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
should use Orchard Core references for the latest patch version to pull all versions up in the final app. -->
99
<OrchardCoreVersion>2.1.0</OrchardCoreVersion>
1010

11-
<LombiqHelpfulLibrariesVersion>12.3.0</LombiqHelpfulLibrariesVersion>
11+
<LombiqHelpfulLibrariesVersion>12.4.0</LombiqHelpfulLibrariesVersion>
1212
<LombiqTestsUIVersion>14.1.0</LombiqTestsUIVersion>
1313
</PropertyGroup>
1414

@@ -41,9 +41,9 @@
4141
<PackageVersion Include="OrchardCore.Title" Version="$(OrchardCoreVersion)" />
4242
<PackageVersion Include="OrchardCore.Workflows.Abstractions" Version="$(OrchardCoreVersion)" />
4343
<PackageVersion Include="Shouldly" Version="4.3.0" />
44-
<PackageVersion Include="Stripe.net" Version="49.0.0" />
44+
<PackageVersion Include="Stripe.net" Version="49.2.0" />
4545
<PackageVersion Include="System.Text.Json" Version="9.0.10" />
46-
<PackageVersion Include="xunit.v3" Version="3.1.0" />
46+
<PackageVersion Include="xunit.v3" Version="3.2.0" />
4747
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4848
</ItemGroup>
4949
</Project>

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# TARGETARCH and TARGETOS are set automatically when --platform is provided.
2-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0@sha256:df1aebc5fd72a1315f34eda24206f195d5ca00ccf2e3009947a74c5a67166cbb AS build-env
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0@sha256:4632e98dc703311ca09d0c37170fe70ad4ba334bd88a841c78cbcc9d29994b2c AS build-env
33
ARG TARGETOS
44
LABEL stage=build-env
55
WORKDIR /source
@@ -14,8 +14,8 @@ COPY Directory.Packages.props .
1414
RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net8.0 /p:RunAnalyzers=false
1515

1616
# build runtime image
17-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:29af1050e3c8aea913ae3b146eb823c50e4a50ae8ed508511c9de9c3847bfa6a AS build_windows
18-
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:ebdd28e9ee54ea5032a390500d37bb1b6d45c36c6ba51e10f3ddfcdc746f3e28 AS build_linux
17+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:c38811f61937add522f95d1ba2f13b695a1628ec5b98010f1098dc88c9fd6aa5 AS build_windows
18+
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:95f47686d234619398df242962148324129b4400aa185986fd571da4e20e24bc AS build_linux
1919
FROM build_${TARGETOS} AS aspnet
2020

2121
EXPOSE 80

Dockerfile-CI

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This Docker file is intended for the CI
22
# A prerequisite is a published application in the .build/release
3-
FROM --platform=$BUILDPLATFORM golang:alpine@sha256:aee43c3ccbf24fdffb7295693b6e33b21e01baec1b2a55acc351fde345e9ec34 AS build
3+
FROM --platform=$BUILDPLATFORM golang:alpine@sha256:d3f0cf7723f3429e3f9ed846243970b20a2de7bae6a5b66fc5914e228d831bbb AS build
44
ARG TARGETOS
55

6-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:29af1050e3c8aea913ae3b146eb823c50e4a50ae8ed508511c9de9c3847bfa6a AS build_windows
7-
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:ebdd28e9ee54ea5032a390500d37bb1b6d45c36c6ba51e10f3ddfcdc746f3e28 AS build_linux
6+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:c38811f61937add522f95d1ba2f13b695a1628ec5b98010f1098dc88c9fd6aa5 AS build_windows
7+
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:95f47686d234619398df242962148324129b4400aa185986fd571da4e20e24bc AS build_linux
88
FROM build_${TARGETOS} AS aspnet
99

1010
EXPOSE 80

package.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)