Skip to content

Commit 74bd4ef

Browse files
sarahelsaigrenovate-bot
sarahelsaig
and
renovate-bot
authored
NEST-608: Update Orchard Core (#720)
* Update All Dependencies * Update OC preview and fix build errors. * Update OC preview. * Update OC preview. * Update OC preview. * Update Lombiq nugets. * Update docker files. * Fix Dockerfile. * Block false positive. --------- Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>
1 parent 075fd44 commit 74bd4ef

5 files changed

Lines changed: 25 additions & 16 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@
66
<!-- The Orchard Core version should always be x.y.0 of the latest minor version for maximum compatibility when
77
distributed as NuGet packages. On the other hand, the consuming projects (including OrchardCore.Commerce.Web)
88
should use Orchard Core references for the latest patch version to pull all versions up in the final app. -->
9-
<OrchardCoreVersion>3.0.0-preview-18914</OrchardCoreVersion>
9+
<OrchardCoreVersion>3.0.0-preview-18937</OrchardCoreVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
1313
<PackageVersion Include="GraphQL.MicrosoftDI" Version="8.8.3" />
1414
<PackageVersion Include="GraphQL.SystemTextJson" Version="8.8.3" />
1515
<PackageVersion Include="HtmlSanitizer" Version="9.1.893-beta" />
1616
<PackageVersion Include="Lombiq.Analyzers.OrchardCore" Version="5.2.1-alpha.3.osoe-925" />
17-
<PackageVersion Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.5.2-alpha.0.osoe-925" />
18-
<PackageVersion Include="Lombiq.HelpfulLibraries.AspNetCore" Version="12.5.2-alpha.0.osoe-925" />
19-
<PackageVersion Include="Lombiq.HelpfulLibraries.Refit" Version="12.5.2-alpha.0.osoe-925" />
17+
<PackageVersion Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.6.1-alpha.5.osoe-925" />
18+
<PackageVersion Include="Lombiq.HelpfulLibraries.AspNetCore" Version="12.6.1-alpha.5.osoe-925" />
19+
<PackageVersion Include="Lombiq.HelpfulLibraries.Refit" Version="12.6.1-alpha.5.osoe-925" />
2020
<PackageVersion Include="Lombiq.Tests" Version="5.0.1-alpha.0.osoe-925" />
21-
<PackageVersion Include="Lombiq.Tests.UI" Version="14.2.2-alpha.1.osoe-925" />
22-
<PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="14.2.2-alpha.1.osoe-925" />
23-
<PackageVersion Include="Lombiq.Tests.UI.Shortcuts" Version="14.2.2-alpha.1.osoe-925" />
24-
<PackageVersion Include="Microsoft.Identity.Web" Version="4.3.0" />
21+
<PackageVersion Include="Lombiq.Tests.UI" Version="14.2.2-alpha.6.osoe-925" />
22+
<PackageVersion Include="Lombiq.Tests.UI.AppExtensions" Version="14.2.2-alpha.6.osoe-925" />
23+
<PackageVersion Include="Lombiq.Tests.UI.Shortcuts" Version="14.2.2-alpha.6.osoe-925" />
24+
<PackageVersion Include="Microsoft.Identity.Web" Version="4.4.0" />
2525
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2626
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
2727
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="$(OrchardCoreVersion)" />

‎Dockerfile‎

Lines changed: 5 additions & 4 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:aa05b91be697b83229cb000b90120f0783604ad74ed92a0b45cdf3d1a9c873de AS build-env
2+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0@sha256:e362a8dbcd691522456da26a5198b8f3ca1d7641c95624fadc5e3e82678bd08a AS build-env
33
ARG TARGETOS
44
LABEL stage=build-env
55
WORKDIR /source
@@ -9,13 +9,14 @@ WORKDIR /source
99
COPY ./src ./src
1010
COPY Directory.Build.props .
1111
COPY Directory.Packages.props .
12+
COPY NuGet.config .
1213

1314
# build, results are placed in /app
14-
RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net8.0 /p:RunAnalyzers=false
15+
RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net10.0 /p:RunAnalyzers=false
1516

1617
# build runtime image
17-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:454026ec875dc2415853bb6376b4d642bf08aa3e9f0478be33e0000a2897307f AS build_windows
18-
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:4b8f0b08534833b39bb662fb19a65e78cb086f5ca8dd35de3f87026de8885be4 AS build_linux
18+
FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:5e0c69d771061e8edcd4951ddafeff807945978086dc0c41e35ba89a46e58914 AS build_windows
19+
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:aec87aa74ddf129da573fa69f42f229a23c953a1c6fdecedea1aa6b1fe147d76 AS build_linux
1920
FROM build_${TARGETOS} AS aspnet
2021

2122
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:98e6cffc31ccc44c7c15d83df1d69891efee8115a5bb7ede2bf30a38af3e3c92 AS build
3+
FROM --platform=$BUILDPLATFORM golang:alpine@sha256:f6751d823c26342f9506c03797d2527668d095b0a15f1862cddb4d927a7a4ced AS build
44
ARG TARGETOS
55

6-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809@sha256:454026ec875dc2415853bb6376b4d642bf08aa3e9f0478be33e0000a2897307f AS build_windows
7-
FROM mcr.microsoft.com/dotnet/aspnet:8.0@sha256:4b8f0b08534833b39bb662fb19a65e78cb086f5ca8dd35de3f87026de8885be4 AS build_linux
6+
FROM mcr.microsoft.com/dotnet/aspnet:10.0-nanoserver-ltsc2022@sha256:5e0c69d771061e8edcd4951ddafeff807945978086dc0c41e35ba89a46e58914 AS build_windows
7+
FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:aec87aa74ddf129da573fa69f42f229a23c953a1c6fdecedea1aa6b1fe147d76 AS build_linux
88
FROM build_${TARGETOS} AS aspnet
99

1010
EXPOSE 80

‎src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net10.0</TargetFramework>
55
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
66
<IsPackable>false</IsPackable>
7-
<OrchardCoreVersion>3.0.0-preview-18914</OrchardCoreVersion>
7+
<OrchardCoreVersion>3.0.0-preview-18937</OrchardCoreVersion>
88
</PropertyGroup>
99

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

‎test/OrchardCore.Commerce.Tests.UI/Tests/BasicTests/SecurityScanningTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ public Task FullSecurityScanShouldPass() =>
4040
"is already handled internally by OC.",
4141
@".*/shoppingcart/AddItem.*");
4242

43+
FalsePositive(
44+
configuration,
45+
40018,
46+
"SQL Injection",
47+
"It has nothing to do with SQL manipulation, it just gave a query that returns different " +
48+
"results (nothing, because we don't have a product called \"ZAP\").",
49+
@".*pagenum=.*products.title=ZAP.*");
50+
4351
FalsePositive(
4452
configuration,
4553
10202,

0 commit comments

Comments
 (0)