yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use GeneratedRegex, FrozenSet, new Lock object & static (#19872)

Browse Source
This commit is contained in:
Henrik
2025-08-07 08:41:53 +02:00
committed by GitHub
parent e5d1c67c36
commit 3a4e0b0654
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.Common/Filters/ModelBindingExceptionAttribute.cs
View File

@@ -85,7 +85,7 @@ public sealed class ModelBindingExceptionAttribute : TypeFilterAttribute
/// The application is in an unstable state and is going to be restarted. The application is restarting now.
/// </para>
/// </remarks>
private bool IsMessageAboutTheSameModelType(string exceptionMessage)
private static bool IsMessageAboutTheSameModelType(string exceptionMessage)
{
MatchCollection matches = GetPublishedModelsTypesRegex.Matches(exceptionMessage);

25
src/Umbraco.Web.Common/ModelsBuilder/InMemoryAuto/InMemoryModelFactory.cs
View File

@@ -1,4 +1,5 @@
using System.Collections;
using System.Collections.Frozen;
using System.Reflection;
using System.Reflection.Emit;
using System.Text;
@@ -21,12 +22,24 @@ using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
namespace Umbraco.Cms.Web.Common.ModelsBuilder.InMemoryAuto
{
internal sealed class InMemoryModelFactory : IAutoPublishedModelFactory, IRegisteredObject, IDisposable
internal sealed partial class InMemoryModelFactory : IAutoPublishedModelFactory, IRegisteredObject, IDisposable
{
private static readonly Regex s_usingRegex = new Regex("^using(.*);", RegexOptions.Compiled | RegexOptions.Multiline);
private static readonly Regex s_aattrRegex = new Regex("^\\[assembly:(.*)\\]", RegexOptions.Compiled | RegexOptions.Multiline);
private static readonly Regex s_assemblyVersionRegex = new Regex("AssemblyVersion\\(\"[0-9]+.[0-9]+.[0-9]+.[0-9]+\"\\)", RegexOptions.Compiled);
private static readonly string[] s_ourFiles = { "models.hash", "models.generated.cs", "all.generated.cs", "all.dll.path", "models.err", "Compiled" };
private static readonly Regex s_usingRegex = GetUsingRegex();
[GeneratedRegex("^using(.*);", RegexOptions.Multiline | RegexOptions.Compiled)]
private static partial Regex GetUsingRegex();
private static readonly Regex s_aattrRegex = GetAssemblyRegex();
[GeneratedRegex("^\\[assembly:(.*)\\]", RegexOptions.Multiline | RegexOptions.Compiled)]
private static partial Regex GetAssemblyRegex();
private static readonly Regex s_assemblyVersionRegex = GetAssemblyVersionRegex();
[GeneratedRegex("AssemblyVersion\\(\"[0-9]+.[0-9]+.[0-9]+.[0-9]+\"\\)", RegexOptions.Compiled)]
private static partial Regex GetAssemblyVersionRegex();
private static readonly FrozenSet<string> s_ourFiles = FrozenSet.Create("models.hash", "models.generated.cs", "all.generated.cs", "all.dll.path", "models.err", "Compiled");
private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
private readonly IProfilingLogger _profilingLogger;
private readonly ILogger<InMemoryModelFactory> _logger;
@@ -797,7 +810,7 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder.InMemoryAuto
// }
// always ignore our own file changes
if (s_ourFiles.Contains(changed))
if (changed != null && s_ourFiles.Contains(changed))
{
return;
}