Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- The Orchard Core version should always be x.y.0 of the latest minor version for maximum compatibility when
distributed as NuGet packages. On the other hand, the consuming projects (including OrchardCore.Commerce.Web)
should use Orchard Core references for the latest patch version to pull all versions up in the final app. -->
<OrchardCoreVersion>3.0.0-preview-18943</OrchardCoreVersion>
<OrchardCoreVersion>3.0.0-preview-18960</OrchardCoreVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# TARGETARCH and TARGETOS are set automatically when --platform is provided.
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0@sha256:e362a8dbcd691522456da26a5198b8f3ca1d7641c95624fadc5e3e82678bd08a AS build-env
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0@sha256:478b9038d187e5b5c29bfa8173ded5d29e864b5ad06102a12106380ee01e2e49 AS build-env
ARG TARGETOS
LABEL stage=build-env
WORKDIR /source
Expand All @@ -15,8 +15,8 @@ COPY NuGet.config .
RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net10.0 /p:RunAnalyzers=false

# build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:5e0c69d771061e8edcd4951ddafeff807945978086dc0c41e35ba89a46e58914 AS build_windows
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:aec87aa74ddf129da573fa69f42f229a23c953a1c6fdecedea1aa6b1fe147d76 AS build_linux
FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:a7c0020148b57b05dbc09365709dbf002d182eb8257d46ec5ad442453aff1718 AS build_windows
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:a04d1c1d2d26119049494057d80ea6cda25bbd8aef7c444a1fc1ef874fd3955b AS build_linux
FROM build_${TARGETOS} AS aspnet

EXPOSE 80
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile-CI
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This Docker file is intended for the CI
# A prerequisite is a published application in the .build/release
FROM --platform=$BUILDPLATFORM golang:alpine@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4ced AS build
FROM --platform=$BUILDPLATFORM golang:alpine@sha256:2389ebfa5b7f43eeafbd6be0c3700cc46690ef842ad962f6c5bd6be49ed82039 AS build
ARG TARGETOS

FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:5e0c69d771061e8edcd4951ddafeff807945978086dc0c41e35ba89a46e58914 AS build_windows
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:aec87aa74ddf129da573fa69f42f229a23c953a1c6fdecedea1aa6b1fe147d76 AS build_linux
FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:a7c0020148b57b05dbc09365709dbf002d182eb8257d46ec5ad442453aff1718 AS build_windows
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:a04d1c1d2d26119049494057d80ea6cda25bbd8aef7c444a1fc1ef874fd3955b AS build_linux
FROM build_${TARGETOS} AS aspnet

EXPOSE 80
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
const BindingFlags privateFieldFlags = BindingFlags.Instance | BindingFlags.NonPublic;
var allowedHeaderTypes = typeof(HttpHeaders).GetField("_allowedHeaderTypes", privateFieldFlags);
allowedHeaderTypes!.SetValue(request.Headers, Enum.Parse(allowedHeaderTypes.FieldType, "All"));
request.Headers.Add("Content-Type", MediaTypeNamesExtended.Application.JsonVendeorPrefix);
request.Headers.Add("Content-Type", MediaTypeNamesExtended.Application.JsonVendorPrefix);
#pragma warning restore S3011

return base.SendAsync(request, cancellationToken);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net10.0</TargetFramework>
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
<IsPackable>false</IsPackable>
<OrchardCoreVersion>3.0.0-preview-18943</OrchardCoreVersion>
<OrchardCoreVersion>3.0.0-preview-18960</OrchardCoreVersion>
</PropertyGroup>

<!-- Currently we don't have any ps1/psm1/psd1 files in the repo, so this is commented out. Add the ProjectReference
Expand Down
Loading