Skip to content

Commit

Permalink
Merge branch 'main' into ImportAsyncEvents
Browse files Browse the repository at this point in the history
  • Loading branch information
hyzx86 authored Oct 15, 2024
2 parents bb9fc82 + 8290cf7 commit ae54ebd
Show file tree
Hide file tree
Showing 768 changed files with 13,427 additions and 7,193 deletions.
36 changes: 36 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3177,6 +3177,42 @@
"contributions": [
"code"
]
},
{
"login": "davidpuplava",
"name": "David Puplava",
"avatar_url": "https://avatars.githubusercontent.com/u/5144137?v=4",
"profile": "https://www.davidpuplava.com",
"contributions": [
"code"
]
},
{
"login": "shinexyt",
"name": "Hanming Xing",
"avatar_url": "https://avatars.githubusercontent.com/u/12826837?v=4",
"profile": "https://github.com/shinexyt",
"contributions": [
"code"
]
},
{
"login": "XopcT",
"name": "Vladimir Verbitsky",
"avatar_url": "https://avatars.githubusercontent.com/u/8039133?v=4",
"profile": "https://github.com/XopcT",
"contributions": [
"code"
]
},
{
"login": "matTrabolsi",
"name": "matTrabolsi",
"avatar_url": "https://avatars.githubusercontent.com/u/72926503?v=4",
"profile": "https://github.com/matTrabolsi",
"contributions": [
"code"
]
}
],
"skipCi": true,
Expand Down
12 changes: 1 addition & 11 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
# ignore all
**

# Except src for building
!./src/*
!Directory.Build.props

# TODO : Remove this line when Docker Buildkit works in Windows
!/.build/release/*

# Ignore any App_Data folder
**/App_Data/

# Ignore all prebuild
# Ignore all built assets
**/[b|B]in/
**/[O|o]bj/
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ dotnet_diagnostic.IDE0303.severity = silent # Co

dotnet_diagnostic.IDE0078.severity = silent # Use pattern matching

dotnet_diagnostic.IDE0130.severity = silent # Namespace does not match folder structure

dotnet_style_prefer_conditional_expression_over_assignment = silent # Remove redundant equality, e.g. Disabled == false

dotnet_diagnostic.CA2263.severity = warning # Prefer generic overload when type is known
Expand Down
6 changes: 6 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
# .git-blame-ignore-revs

# Define formatting rules (#16567)
657342d05a221dfaba1fdf46813c0161dd12d4ec

# Convert to file-scope namespaces (#16539)
05730cfeb221680240feb3d9edca563bc388a1ef
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Update the source, so everything looks like on the new version.
- [ ] Update the `OrchardCore.Commons.props` file with `<VersionSuffix></VersionSuffix>` such that preview build numbers are not injected in packages. Verify the `VersionPrefix` tag matches the released version.
- [ ] Update module versions in `src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs`.
- [ ] Create a new milestone.
- [ ] Change the Orchard Core version in the project templates, more specifically in `dotnetcli.host.json` and `template.json` files.
- [ ] Add final updates to the release notes in the documentation. It should include the following, at least:
- Overview of the release's highlights and goals. What do you want people to remember this release for?
- Prerequisites. What framework version do you need, anything else to work with Orchard?
Expand Down
16 changes: 13 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
version: 2
updates:
- package-ecosystem: "nuget" # See documentation for possible values
directory: "/" # Location of package manifests
# Dependabot can handle at most 150 "manifests", so for NuGet, csprojs referencing packages (see docs:
# https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/troubleshooting-the-dependency-graph#are-there-limits-which-affect-the-dependency-graph-data).
# Thus, it would fail for the whole solution.
# Grouping updates per directories or otherwise trying to have smaller batches is unnecessary, because due to
# centralized package management, Dependabot will find all dependencies from any project. So, just processing the
# OrchardCore project.
- package-ecosystem: "nuget"
directory: "/src/OrchardCore/OrchardCore"
schedule:
interval: "weekly"
groups:
# Grouped version updates configuration
all-dependencies:
patterns:
- "*"
ignore:
# We'll update GraphQL for v3 because it's breaking, see https://github.com/OrchardCMS/OrchardCore/issues/16826.
- dependency-name: "GraphQL*"
# See the corresponding comment in Directory.Packages.props.
- dependency-name: "System.Drawing.Common"
1 change: 1 addition & 0 deletions .github/workflows/first_time_contributor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
# directly.
- uses: OrchardCMS/welcome-action@task/update-to-node-20
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FIRST_ISSUE_COMMENT: >
Thank you for submitting your first issue, awesome! 🚀 We're thrilled to receive your input. If you haven't
completed the template yet, please take a moment to do so. This ensures that we fully understand your feature
Expand Down
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,14 @@ wwwroot
!src/OrchardCore.Themes/**/wwwroot
!src/OrchardCore.Modules/**/Localization/**/*.po
!src/OrchardCore.Themes/**/Localization/**/*.po
!src/Templates/**/content/**
src/Templates/**/content/**/[Bb]in/
src/Templates/**/content/**/[Oo]bj/
.template.config/
/OrchardCore.sln.GhostDoc.xml

# Templates
# .template.config folders are generated by our own msbuild task that injects the build version
src/Templates/**/content/**/.template.config/

# Rider
/.idea

# BenchmarkDotNet artifacts
BenchmarkDotNet.Artifacts

3 changes: 0 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<!-- Exception type is not sufficiently specific -->
<NoWarn>$(NoWarn);CA2201</NoWarn>

<!-- Use PascalCase for named placeholders in the logging message template -->
<NoWarn>$(NoWarn);CA1727</NoWarn>

<!-- CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array -->
<NoWarn>$(NoWarn);CA1861</NoWarn>

Expand Down
101 changes: 45 additions & 56 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,90 +1,82 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<!-- Special case - this property is used by a DotNetCliToolReference -->
<DotNetXunitVersion>2.3.0</DotNetXunitVersion>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.1.2" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.400.4" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.404.1" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
<PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.4" />
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
<PackageVersion Include="Azure.Identity" Version="1.12.1" />
<PackageVersion Include="Azure.Search.Documents" Version="11.6.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.21.2" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.22.1" />
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
<PackageVersion Include="Castle.Core" Version="5.1.1" />
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.1.0" />
<PackageVersion Include="Fluid.Core" Version="2.11.1" />
<PackageVersion Include="GraphQL" Version="7.8.0" />
<PackageVersion Include="GraphQL.DataLoader" Version="7.8.0" />
<PackageVersion Include="GraphQL.MicrosoftDI" Version="7.8.0" />
<PackageVersion Include="GraphQL.SystemTextJson" Version="7.8.0" />
<PackageVersion Include="Jint" Version="4.0.1" />
<PackageVersion Include="JsonPath.Net" Version="1.1.4" />
<PackageVersion Include="GraphQL" Version="7.9.0" />
<PackageVersion Include="GraphQL.DataLoader" Version="7.9.0" />
<PackageVersion Include="GraphQL.MicrosoftDI" Version="7.9.0" />
<PackageVersion Include="GraphQL.SystemTextJson" Version="7.9.0" />
<PackageVersion Include="Jint" Version="4.0.3" />
<PackageVersion Include="JsonPath.Net" Version="1.1.6" />
<PackageVersion Include="HtmlSanitizer" Version="8.2.871-beta" />
<PackageVersion Include="Irony" Version="1.5.1" />
<PackageVersion Include="libphonenumber-csharp" Version="8.13.43" />
<PackageVersion Include="Irony" Version="1.5.3" />
<PackageVersion Include="libphonenumber-csharp" Version="8.13.47" />
<PackageVersion Include="Lorem.Universal.NET" Version="4.0.80" />
<PackageVersion Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
<PackageVersion Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
<PackageVersion Include="MailKit" Version="4.7.1.1" />
<PackageVersion Include="MailKit" Version="4.8.0" />
<PackageVersion Include="Markdig" Version="0.37.0" />
<PackageVersion Include="MessagePack" Version="2.2.60" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.4" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.0.1" />

<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.9.1" />
<PackageVersion Include="Microsoft.Identity.Web" Version="3.2.0" />
<!--
Important: the version of the Microsoft.IdentityModel.Protocols.OpenIdConnect package MUST
match the IdentityModel version transitively referenced by OpenIddict to ensure we don't
accidentally end up referencing inconsistent versions (which is not supported by IM).
See https://github.com/OrchardCMS/OrchardCore/pull/16057 for more information.
-->

<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.10.0"/>
<PackageVersion Include="MimeKit" Version="4.7.1" />
<PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="MimeKit" Version="4.8.0" />
<PackageVersion Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
<PackageVersion Include="Moq" Version="4.20.70" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="ncrontab" Version="3.3.3" />
<PackageVersion Include="NEST" Version="7.17.5" />
<PackageVersion Include="NJsonSchema" Version="11.0.2" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.11" />
<PackageVersion Include="NodaTime" Version="3.1.11" />
<PackageVersion Include="OpenIddict.Core" Version="5.7.0" />
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.7.0" />
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.7.0" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.7.0" />
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.7.0" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.7.0" />
<PackageVersion Include="OrchardCore.Translations.All" Version="1.8.0" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="5.3.14" />
<PackageVersion Include="NodaTime" Version="3.2.0" />
<PackageVersion Include="OpenIddict.Core" Version="5.8.0" />
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="5.8.0" />
<PackageVersion Include="OpenIddict.Server.DataProtection" Version="5.8.0" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.8.0" />
<PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.8.0" />
<PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.8.0" />
<PackageVersion Include="OrchardCore.Translations.All" Version="2.0.0" />
<PackageVersion Include="PdfPig" Version="0.1.8" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
<PackageVersion Include="Shortcodes" Version="1.3.4" />
<PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.1.3" />
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.AWS" Version="3.1.3" />
<PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.8.16" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.analyzers" Version="1.15.0" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.analyzers" Version="1.16.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="YesSql" Version="5.1.1" />
<PackageVersion Include="YesSql.Abstractions" Version="5.1.1" />
Expand All @@ -93,10 +85,13 @@
<PackageVersion Include="YesSql.Filters.Query" Version="5.1.1" />
<PackageVersion Include="ZString" Version="2.6.0" />
</ItemGroup>

<!-- These versions are used for tansitive dependency forced upgrades only. For instance when a package reference a vulnerable version. -->
<!-- To list all vulnerable direct references run 'dotnet list package -vulnerable' -->
<!-- To list all vulnerable transitive references run 'dotnet list package -vulnerable -include-transitive' -->
<ItemGroup>
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.11.0" />
</ItemGroup>
<!-- These versions are used for tansitive dependency forced upgrades only. E.g. when a package references a vulnerable version. -->
<!-- To list all vulnerable direct references run 'dotnet list package -vulnerable' (use double dash, just XML comments can't contain it) -->
<!-- To list all vulnerable transitive references run 'dotnet list package -vulnerable -include-transitive' (use double dash, just XML comments can't contain it) -->
<!-- The dependency graphs are generated using 'dotnet nuget why <.sln> <package id>' -->
<ItemGroup>
<!--
Expand All @@ -107,7 +102,6 @@
└─ System.Text.RegularExpressions (v4.3.0)
-->
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

<!--
Azure.Extensions.AspNetCore.DataProtection.Blobs (v1.3.4)
└─ Microsoft.AspNetCore.DataProtection (v3.1.32)
Expand All @@ -116,8 +110,8 @@
└─ System.Windows.Extensions (v4.7.0)
└─ System.Drawing.Common (v4.7.0)
-->
<!-- When removing this, remove the corresponding ignore in dependabot.yml too. -->
<PackageVersion Include="System.Drawing.Common" Version="4.7.2" />

<!--
Microsoft.AspNetCore.DataProtection.StackExchangeRedis (v8.0.8)
└─ Microsoft.AspNetCore.DataProtection (v8.0.8)
Expand All @@ -127,21 +121,18 @@
-->
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
</ItemGroup>

<!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
<!-- Versions are preset for the default TFM (there may be no TFM in an evaluation phase) -->
<PropertyGroup>
<AspNetCorePackagesVersion>8.0.8</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>8.0.8</MicrosoftExtensionsPackagesVersion>
<AspNetCorePackagesVersion>8.0.10</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>8.0.10</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<!-- When dual-targeting frameworks, add both of them to CommonTargetFrameworks above, when add PropertyGroups like
below. -->
<!--<PropertyGroup Condition="$(TargetFramework) == 'net7.0'">
<AspNetCorePackagesVersion>7.0.14</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>7.0.14</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>-->

<!-- 'Microsoft.AspNetCore' packages that are not included in the ASP.NET Core shared framework -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="$(AspNetCorePackagesVersion)" />
Expand All @@ -154,11 +145,9 @@
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCorePackagesVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="$(AspNetCorePackagesVersion)" />
</ItemGroup>

<!-- 'Microsoft.Extensions' packages that are not included in the ASP.NET Core shared framework -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftExtensionsPackagesVersion)" />
<!-- Microsoft.Extensions.Http.Resilience is not here because it diverged from the common Microsoft.Extensions versioning. -->
</ItemGroup>

</Project>
</Project>
24 changes: 13 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
FROM --platform=$BUILDPLATFORM golang:alpine AS build
# TARGETARCH and TARGETOS are set automatically when --platform is provided.
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
ARG TARGETOS

FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
LABEL stage=build-env
WORKDIR /app
WORKDIR /source

# Copy and build
COPY ./src /app
COPY Directory.Build.props /
# copy required files for building
# .dockerignore excludes App_Data and binaries from these
COPY ./src ./src
COPY Directory.Build.props .
COPY Directory.Packages.props .

RUN dotnet publish /app/OrchardCore.Cms.Web -c Release -o ./build/release --framework net8.0 /p:RunAnalyzers=false
# build, results are placed in /app
RUN dotnet publish src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj -c Release -o /app --framework net8.0 /p:RunAnalyzers=false

# Build runtime image
# build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux
FROM build_${TARGETOS} AS aspnet

EXPOSE 80
ENV ASPNETCORE_URLS http://+:80
ENV ASPNETCORE_URLS=http://+:80
WORKDIR /app
COPY --from=build-env /app/build/release .
COPY --from=build-env /app/ .
ENTRYPOINT ["dotnet", "OrchardCore.Cms.Web.dll"]
Loading

0 comments on commit ae54ebd

Please sign in to comment.