diff --git a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs index 25812209add8..8468ea27ef5b 100644 --- a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs +++ b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs @@ -104,11 +104,11 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails() Assert.True(logs.Count > 0); - Assert.Matches(ParseErrorMessage(), logs[0].Message); + Assert.Matches(ParseErrorMessageRegex, logs[0].Message); } [GeneratedRegex(@"security - Refused to frame 'http://\d+\.\d+\.\d+\.\d+:\d+/' because an ancestor violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")] - private static partial Regex ParseErrorMessage(); + private static partial Regex ParseErrorMessageRegex { get; } } public partial class DefaultConfigurationWebSocketCompressionTests : AllowedWebSocketCompressionTests diff --git a/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs index f935ac4fe3a0..1d3e5d133900 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs @@ -32,11 +32,11 @@ public void StaticRendering_CanUseFingerprintedResources() var url = $"{ServerPathBase}/resource-collection"; Navigate(url); - Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text)); + Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text)); Browser.Exists(By.Id("import-module")).Click(); - Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text)); + Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text)); } [Theory] @@ -49,15 +49,15 @@ public void StaticRendering_CanUseFingerprintedResources_InteractiveModes(string Browser.Equal(renderMode, () => Browser.Exists(By.Id("platform-name")).Text); - Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text)); + Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text)); Browser.Exists(By.Id("import-module")).Click(); - Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text)); + Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text)); } [GeneratedRegex("""BasicTestApp\.[a-zA-Z0-9]{10}\.styles\.css""")] - private static partial Regex AppStylesRegex(); + private static partial Regex AppStylesRegex { get; } [GeneratedRegex(""".*Index\.[a-zA-Z0-9]{10}\.mjs""")] - private static partial Regex JsModuleRegex(); + private static partial Regex JsModuleRegex { get; } } diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs index 656515d75efa..656509e93573 100644 --- a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs +++ b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs @@ -117,16 +117,16 @@ public async Task IncrementallyUpdatesCache() } [GeneratedRegex("/Microsoft\\.AspNetCore\\.Components\\.\\w*\\.wasm")] - private static partial Regex GetFingerprintedComponentsEntryRegex(); + private static partial Regex GetFingerprintedComponentsEntryRegex { get; } [GeneratedRegex("/dotnet\\.native\\.\\w*\\.wasm")] - private static partial Regex GetFingerprintedDotNetWasmEntryRegex(); + private static partial Regex GetFingerprintedDotNetWasmEntryRegex { get; } private static bool IsFingerprintedComponentsEntry(string url) - => GetFingerprintedComponentsEntryRegex().IsMatch(url); + => GetFingerprintedComponentsEntryRegex.IsMatch(url); private static bool IsFingerprintedDotNetWasmEntry(string url) - => GetFingerprintedDotNetWasmEntryRegex().IsMatch(url); + => GetFingerprintedDotNetWasmEntryRegex.IsMatch(url); private IReadOnlyCollection GetCacheEntryUrls() { diff --git a/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs index d30097761650..422288ef0f01 100644 --- a/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs +++ b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs @@ -20,10 +20,10 @@ internal partial class AlphaRouteConstraint : RegexRouteConstraint /// /// Initializes a new instance of the class. /// - public AlphaRouteConstraint() : base(GetAlphaRouteRegex()) + public AlphaRouteConstraint() : base(AlphaRouteRegex) { } [GeneratedRegex(@"^[A-Za-z]*$")] - private static partial Regex GetAlphaRouteRegex(); + private static partial Regex AlphaRouteRegex { get; } } diff --git a/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs b/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs index c0fdeba9c553..45d3973a140f 100644 --- a/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs +++ b/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs @@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate; internal static partial class LdapAdapter { [GeneratedRegex(@"(? GetNssDbs(string homeDirectory) } [GeneratedRegex("OPENSSLDIR:\\s*\"([^\"]+)\"")] - private static partial Regex OpenSslVersionRegex(); + private static partial Regex OpenSslVersionRegex { get; } /// /// It is the caller's responsibility to ensure that is available. @@ -803,7 +803,7 @@ private static bool TryGetOpenSslDirectory([NotNullWhen(true)] out string? openS return false; } - var match = OpenSslVersionRegex().Match(stdout); + var match = OpenSslVersionRegex.Match(stdout); if (!match.Success) { Log.UnixOpenSslVersionParsingFailed(); @@ -858,14 +858,14 @@ private static bool TryGetOpenSslHash(string certificatePath, [NotNullWhen(true) } [GeneratedRegex("^[0-9a-f]+\\.[0-9]+$")] - private static partial Regex OpenSslHashFilenameRegex(); + private static partial Regex OpenSslHashFilenameRegex { get; } /// /// We only ever use .pem, but someone will eventually put their own cert in this directory, /// so we should handle the same extensions as c_rehash (other than .crl). /// [GeneratedRegex("\\.(pem|crt|cer)$")] - private static partial Regex OpenSslCertificateExtensionRegex(); + private static partial Regex OpenSslCertificateExtensionRegex { get; } /// /// This is a simplified version of c_rehash from OpenSSL. Using the real one would require @@ -876,21 +876,17 @@ private static bool TryRehashOpenSslCertificates(string certificateDirectory) try { // First, delete all the existing symlinks, so we don't have to worry about fragmentation or leaks. - - var hashRegex = OpenSslHashFilenameRegex(); - var extensionRegex = OpenSslCertificateExtensionRegex(); - var certs = new List(); var dirInfo = new DirectoryInfo(certificateDirectory); foreach (var file in dirInfo.EnumerateFiles()) { var isSymlink = (file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint; - if (isSymlink && hashRegex.IsMatch(file.Name)) + if (isSymlink && OpenSslHashFilenameRegex.IsMatch(file.Name)) { file.Delete(); } - else if (extensionRegex.IsMatch(file.Name)) + else if (OpenSslCertificateExtensionRegex.IsMatch(file.Name)) { certs.Add(file); }