Use Ulid instead of Guid for better PERF

Directory.Packages.props

@@ -81,6 +81,7 @@
     <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="Ulid" Version="1.3.4" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.analyzers" Version="1.16.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs

@@ -216,7 +216,7 @@ public async Task<ShellSettings> CreateTenantSettingsAsync(TenantSetupOptions se
         shellSettings["TablePrefix"] = setupOptions.DatabaseTablePrefix;
         shellSettings["Schema"] = setupOptions.DatabaseSchema;
         shellSettings["DatabaseProvider"] = setupOptions.DatabaseProvider;
-        shellSettings["Secret"] = Guid.NewGuid().ToString();
+        shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
         shellSettings["RecipeName"] = setupOptions.RecipeName;
         shellSettings["FeatureProfile"] = setupOptions.FeatureProfile;
 

src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs

@@ -63,7 +63,7 @@ public async Task<RemoteClient> CreateRemoteClientAsync(string clientName, strin
 
         var remoteClient = new RemoteClient
         {
-            Id = Guid.NewGuid().ToString("n"),
+            Id = Ulid.NewUlid().ToGuid().ToString("n"),
             ClientName = clientName,
             ProtectedApiKey = _dataProtector.Protect(Encoding.UTF8.GetBytes(apiKey)),
         };

src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs

@@ -49,7 +49,7 @@ public async Task CreateRemoteInstanceAsync(string name, string url, string clie
 
         remoteInstanceList.RemoteInstances.Add(new RemoteInstance
         {
-            Id = Guid.NewGuid().ToString("n"),
+            Id = Ulid.NewUlid().ToGuid().ToString("n"),
             Name = name,
             Url = url,
             ClientName = clientName,

src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs

@@ -62,7 +62,7 @@ public async Task<IActionResult> Create(long id, string type)
             return NotFound();
         }
 
-        step.Id = Guid.NewGuid().ToString("n");
+        step.Id = Ulid.NewUlid().ToGuid().ToString("n");
 
         var model = new EditDeploymentPlanStepViewModel
         {

src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs

@@ -19,7 +19,7 @@ public IHtmlContent CachedShapeWrapper(IShape Shape)
         var cache = metadata.Cache();
 
         contentBuilder.AppendLine();
-        contentBuilder.AppendHtmlLine($"<!-- CACHED SHAPE: {cache.CacheId} ({Guid.NewGuid()})");
+        contentBuilder.AppendHtmlLine($"<!-- CACHED SHAPE: {cache.CacheId} ({Ulid.NewUlid().ToGuid()})");
         contentBuilder.AppendHtmlLine($"          VARY BY: {string.Join(", ", cache.Contexts)}");
         contentBuilder.AppendHtmlLine($"     DEPENDENCIES: {string.Join(", ", cache.Tags)}");
         contentBuilder.AppendHtmlLine($"       EXPIRES ON: {cache.ExpiresOn}");

src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs

@@ -202,7 +202,7 @@ public async Task<IHtmlContent> ProcessContentAsync(TagHelperOutput output, Cach
                         {
                             // No need to optimize this code as it will be used for debugging purpose.
                             writer.WriteLine();
-                            writer.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
+                            writer.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Ulid.NewUlid().ToGuid()})");
                             writer.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
                             writer.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
                             writer.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");

src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpEmailProviderBase.cs

@@ -181,7 +181,7 @@ private async Task<string> SendOnlineMessageAsync(MimeMessage message)
 
     private static Task SendOfflineMessageAsync(MimeMessage message, string pickupDirectory)
     {
-        var mailPath = Path.Combine(pickupDirectory, Guid.NewGuid().ToString() + EmailExtension);
+        var mailPath = Path.Combine(pickupDirectory, Ulid.NewUlid().ToGuid().ToString() + EmailExtension);
 
         return message.WriteToAsync(mailPath, CancellationToken.None);
     }

src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs

@@ -51,7 +51,7 @@ public async Task Invoke(HttpContext httpContext)
                     var script = $@"[{filters}].forEach(value=>{{if(!liquidFilters.includes(value)){{ liquidFilters.push(value);}}}});
                                 [{tags}].forEach(value=>{{if(!liquidTags.includes(value)){{ liquidTags.push(value);}}}});";
 
-                    _etag = Guid.NewGuid().ToString("n");
+                    _etag = Ulid.NewUlid().ToGuid().ToString("n");
                     _bytes = Encoding.UTF8.GetBytes(script);
                 }
 

src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs

@@ -621,7 +621,7 @@ private static RSA GenerateRsaSecurityKey(int size)
     private async Task PersistCertificateAsync(DirectoryInfo directory, X509Certificate2 certificate)
     {
         var password = GeneratePassword();
-        var path = Path.Combine(directory.FullName, Guid.NewGuid().ToString());
+        var path = Path.Combine(directory.FullName, Ulid.NewUlid().ToGuid().ToString());
 
         await File.WriteAllBytesAsync(Path.ChangeExtension(path, ".pfx"), certificate.Export(X509ContentType.Pfx, password));
         await File.WriteAllTextAsync(Path.ChangeExtension(path, ".pwd"), _dataProtector.Protect(password));

src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs

@@ -106,7 +106,7 @@ public async Task<ActionResult> Execute(string basePath, string fileName)
 
         try
         {
-            var executionId = Guid.NewGuid().ToString("n");
+            var executionId = Ulid.NewUlid().ToGuid().ToString("n");
 
             await _recipeExecutor.ExecuteAsync(executionId, recipe, environment, CancellationToken.None);
 

src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs

@@ -30,7 +30,7 @@ public RecipeDeploymentTargetHandler(IShellHost shellHost,
 
     public async Task ImportFromFileAsync(IFileProvider fileProvider)
     {
-        var executionId = Guid.NewGuid().ToString("n");
+        var executionId = Ulid.NewUlid().ToGuid().ToString("n");
         var recipeDescriptor = new RecipeDescriptor
         {
             FileProvider = fileProvider,

src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs

@@ -52,7 +52,7 @@ private Task<SiteSettings> GetDefaultSettingsAsync()
     {
         return Task.FromResult(new SiteSettings
         {
-            SiteSalt = Guid.NewGuid().ToString("N"),
+            SiteSalt = Ulid.NewUlid().ToGuid().ToString("N"),
             SiteName = "My Orchard Project Application",
             PageTitleFormat = "{% page_title Site.SiteName, position: \"after\", separator: \" - \" %}",
             TimeZoneId = _clock.GetSystemTimeZone().TimeZoneId,

src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs

@@ -376,7 +376,7 @@ public async Task<IActionResult> Create(EditTenantViewModel model, string action
             shellSettings["TablePrefix"] = model.TablePrefix;
             shellSettings["Schema"] = model.Schema;
             shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-            shellSettings["Secret"] = Guid.NewGuid().ToString();
+            shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
             shellSettings["RecipeName"] = model.RecipeName;
             shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
 
@@ -499,7 +499,7 @@ public async Task<IActionResult> Edit(EditTenantViewModel model)
                 shellSettings["Schema"] = model.Schema;
                 shellSettings["ConnectionString"] = model.ConnectionString;
                 shellSettings["RecipeName"] = model.RecipeName;
-                shellSettings["Secret"] = Guid.NewGuid().ToString();
+                shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
             }
 
             await _shellHost.UpdateShellSettingsAsync(shellSettings);

src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs

@@ -116,7 +116,7 @@ public async Task<IActionResult> Create(TenantApiModel model)
                 shellSettings["TablePrefix"] = model.TablePrefix;
                 shellSettings["Schema"] = model.Schema;
                 shellSettings["DatabaseProvider"] = model.DatabaseProvider;
-                shellSettings["Secret"] = Guid.NewGuid().ToString();
+                shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
                 shellSettings["RecipeName"] = model.RecipeName;
                 shellSettings["FeatureProfile"] = string.Join(',', model.FeatureProfiles ?? []);
 
@@ -179,7 +179,7 @@ public async Task<IActionResult> Edit(TenantApiModel model)
                 shellSettings["Schema"] = model.Schema;
                 shellSettings["ConnectionString"] = model.ConnectionString;
                 shellSettings["RecipeName"] = model.RecipeName;
-                shellSettings["Secret"] = Guid.NewGuid().ToString();
+                shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
             }
 
             await _shellHost.UpdateShellSettingsAsync(shellSettings);

src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj

@@ -32,6 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="NJsonSchema" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>

src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs

@@ -169,7 +169,7 @@ public override async Task<ActivityExecutionResult> ExecuteAsync(WorkflowExecuti
             shellSettings["FeatureProfile"] = featureProfile;
         }
 
-        shellSettings["Secret"] = Guid.NewGuid().ToString();
+        shellSettings["Secret"] = Ulid.NewUlid().ToGuid().ToString();
 
         await ShellHost.UpdateShellSettingsAsync(shellSettings);
         var reloadedSettings = ShellHost.GetSettings(shellSettings.Name);

src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs

@@ -104,7 +104,7 @@ public async Task<IActionResult> Login(string returnUrl = null)
                 var dataProtector = _dataProtectionProvider.CreateProtector(ExternalAuthenticationsController.DefaultExternalLoginProtector)
                     .ToTimeLimitedDataProtector();
 
-                var token = Guid.NewGuid();
+                var token = Ulid.NewUlid().ToGuid();
                 var expiration = new TimeSpan(0, 0, 5);
                 var protectedToken = dataProtector.Protect(token.ToString(), _clock.UtcNow.Add(expiration));
                 await _distributedCache.SetAsync(token.ToString(), token.ToByteArray(), new DistributedCacheEntryOptions()

src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs

@@ -373,7 +373,7 @@ public async Task<IActionResult> Edit(long id, string localId)
             return Forbid();
         }
 
-        var newLocalId = string.IsNullOrWhiteSpace(localId) ? Guid.NewGuid().ToString() : localId;
+        var newLocalId = string.IsNullOrWhiteSpace(localId) ? Ulid.NewUlid().ToGuid().ToString() : localId;
         var availableActivities = _activityLibrary.ListActivities();
         var workflowType = await _session.GetAsync<WorkflowType>(id);
 

src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs

@@ -7,7 +7,7 @@ public static class IdGenerator
 
     public static string GenerateId()
     {
-        var guid = Guid.NewGuid().ToByteArray();
+        var guid = Ulid.NewUlid().ToGuid().ToByteArray();
 
         return string.Create(26, guid, (buffer, guid) =>
         {

src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs

@@ -2,7 +2,7 @@ namespace OrchardCore.AdminMenu.Models;
 
 public class AdminMenu
 {
-    public string Id { get; set; } = Guid.NewGuid().ToString("n");
+    public string Id { get; set; } = Ulid.NewUlid().ToGuid().ToString("n");
     public string Name { get; set; }
     public bool Enabled { get; set; } = true;
     public List<AdminNode> MenuItems { get; init; } = [];

src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs

@@ -4,7 +4,7 @@ namespace OrchardCore.AdminMenu.Models;
 
 public class AdminNode : MenuItem
 {
-    public string UniqueId { get; set; } = Guid.NewGuid().ToString("n");
+    public string UniqueId { get; set; } = Ulid.NewUlid().ToGuid().ToString("n");
     public bool Enabled { get; set; } = true;
 
     public AdminNode GetMenuItemById(string id)

src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs

@@ -108,7 +108,7 @@ The contents of the cache block will not be cached.
             // No need to optimize this code as it will be used for debugging purpose.
             var debugContent = new StringWriter();
             debugContent.WriteLine();
-            debugContent.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Guid.NewGuid()})");
+            debugContent.WriteLine($"<!-- CACHE BLOCK: {cacheContext.CacheId} ({Ulid.NewUlid().ToGuid()})");
             debugContent.WriteLine($"         VARY BY: {string.Join(", ", cacheContext.Contexts)}");
             debugContent.WriteLine($"    DEPENDENCIES: {string.Join(", ", cacheContext.Tags)}");
             debugContent.WriteLine($"      EXPIRES ON: {cacheContext.ExpiresOn}");

src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs

@@ -8,7 +8,7 @@ public class DefaultIdGenerator : IIdGenerator
     public string GenerateUniqueId()
     {
         // Generate a base32 Guid value
-        var guid = Guid.NewGuid().ToByteArray();
+        var guid = Ulid.NewUlid().ToGuid().ToByteArray();
 
         var hs = BitConverter.ToInt64(guid, 0);
         var ls = BitConverter.ToInt64(guid, 8);

src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs

@@ -268,7 +268,7 @@ public virtual ValueTask<ImmutableDictionary<string, string>> GetSettingsAsync(T
 
     /// <inheritdoc/>
     public virtual ValueTask<TApplication> InstantiateAsync(CancellationToken cancellationToken)
-        => new(new TApplication { ApplicationId = Guid.NewGuid().ToString("n") });
+        => new(new TApplication { ApplicationId = Ulid.NewUlid().ToGuid().ToString("n") });
 
     /// <inheritdoc/>
     public virtual IAsyncEnumerable<TApplication> ListAsync(int? count, int? offset, CancellationToken cancellationToken)

src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs

@@ -257,7 +257,7 @@ public virtual ValueTask<string> GetTypeAsync(TAuthorization authorization, Canc
 
     /// <inheritdoc/>
     public virtual ValueTask<TAuthorization> InstantiateAsync(CancellationToken cancellationToken)
-        => new(new TAuthorization { AuthorizationId = Guid.NewGuid().ToString("n") });
+        => new(new TAuthorization { AuthorizationId = Ulid.NewUlid().ToGuid().ToString("n") });
 
     /// <inheritdoc/>
     public virtual IAsyncEnumerable<TAuthorization> ListAsync(int? count, int? offset, CancellationToken cancellationToken)

src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs

@@ -210,7 +210,7 @@ public virtual ValueTask<ImmutableArray<string>> GetResourcesAsync(TScope scope,
 
     /// <inheritdoc/>
     public virtual ValueTask<TScope> InstantiateAsync(CancellationToken cancellationToken)
-        => new(new TScope { ScopeId = Guid.NewGuid().ToString("n") });
+        => new(new TScope { ScopeId = Ulid.NewUlid().ToGuid().ToString("n") });
 
     /// <inheritdoc/>
     public virtual IAsyncEnumerable<TScope> ListAsync(int? count, int? offset, CancellationToken cancellationToken)

src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs

@@ -293,7 +293,7 @@ public virtual ValueTask<string> GetTypeAsync(TToken token, CancellationToken ca
 
     /// <inheritdoc/>
     public virtual ValueTask<TToken> InstantiateAsync(CancellationToken cancellationToken)
-        => new(new TToken { TokenId = Guid.NewGuid().ToString("n") });
+        => new(new TToken { TokenId = Ulid.NewUlid().ToGuid().ToString("n") });
 
     /// <inheritdoc/>
     public virtual IAsyncEnumerable<TToken> ListAsync(int? count, int? offset, CancellationToken cancellationToken)

src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs

@@ -131,7 +131,7 @@ public async Task<string> ExecuteAsync(string executionId, RecipeDescriptor reci
                             {
                                 foreach (var descriptor in recipeStep.InnerRecipes)
                                 {
-                                    var innerExecutionId = Guid.NewGuid().ToString();
+                                    var innerExecutionId = Ulid.NewUlid().ToGuid().ToString();
                                     descriptor.RequireNewScope = recipeDescriptor.RequireNewScope;
                                     await ExecuteAsync(innerExecutionId, descriptor, environment, cancellationToken);
                                 }

src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs

@@ -52,7 +52,7 @@ public async Task<string> ExecuteAsync(string recipeFileName, IDataMigration mig
         await _environmentProviders.OrderBy(x => x.Order)
             .InvokeAsync((provider, env) => provider.PopulateEnvironmentAsync(env), environment, _logger);
 
-        var executionId = Guid.NewGuid().ToString("n");
+        var executionId = Ulid.NewUlid().ToGuid().ToString("n");
 
         return await _recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, environment, CancellationToken.None);
     }

src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs

@@ -220,7 +220,7 @@ await scope.ServiceProvider.GetService<IShellDescriptorManager>()
                 return null;
             }
 
-            executionId = Guid.NewGuid().ToString("n");
+            executionId = Ulid.NewUlid().ToGuid().ToString("n");
 
             var recipeExecutor = shellContext.ServiceProvider.GetRequiredService<IRecipeExecutor>();
             try

src/OrchardCore/OrchardCore.Users.Core/Authentication/CacheTicketStore.cs

@@ -80,7 +80,7 @@ await _distributedCache.SetAsync(cacheKey, protectedBytes,
 
     public async Task<string> StoreAsync(AuthenticationTicket ticket)
     {
-        var key = Guid.NewGuid().ToString();
+        var key = Ulid.NewUlid().ToGuid().ToString();
         var cacheKey = $"{KeyPrefix}-{key}";
 
         try

test/OrchardCore.Tests/Apis/Context/SiteContext.cs

@@ -37,7 +37,7 @@ static SiteContext()
 
     public virtual async Task InitializeAsync()
     {
-        var tenantName = Guid.NewGuid().ToString("n");
+        var tenantName = Ulid.NewUlid().ToGuid().ToString("n");
         var tablePrefix = await _tablePrefixGenerator.GeneratePrefixAsync();
 
         var createModel = new Tenants.Models.TenantApiModel
@@ -83,7 +83,7 @@ public virtual async Task InitializeAsync()
 
         if (PermissionsContext != null)
         {
-            var permissionContextKey = Guid.NewGuid().ToString();
+            var permissionContextKey = Ulid.NewUlid().ToGuid().ToString();
             SiteStartup.PermissionsContexts.TryAdd(permissionContextKey, PermissionsContext);
             Client.DefaultRequestHeaders.Add("PermissionsContext", permissionContextKey);
         }
@@ -114,7 +114,7 @@ await UsingTenantScopeAsync(async scope =>
             var recipe = recipes
                 .FirstOrDefault(recipe => recipe.RecipeFileInfo.Name == recipeName && recipe.BasePath == recipePath);
 
-            var executionId = Guid.NewGuid().ToString("n");
+            var executionId = Ulid.NewUlid().ToGuid().ToString("n");
 
             await recipeExecutor.ExecuteAsync(
                 executionId,

test/OrchardCore.Tests/Data/JsonDynamicTests.cs

@@ -140,7 +140,7 @@ public void JsonDynamicValueMustConvertToNullableDouble()
     [Fact]
     public void JsonDynamicValueMustConvertToGuid()
     {
-        Guid expectedValue = Guid.NewGuid();
+        Guid expectedValue = Ulid.NewUlid().ToGuid();
         dynamic myDynamic = new JsonDynamicValue(JsonValue.Create(expectedValue));
 
         Assert.Equal(expectedValue, (Guid)myDynamic);
@@ -149,7 +149,7 @@ public void JsonDynamicValueMustConvertToGuid()
     [Fact]
     public void JsonDynamicValueMustConvertToNullableGuid()
     {
-        Guid? expectedValue = Guid.NewGuid();
+        Guid? expectedValue = Ulid.NewUlid().ToGuid();
         dynamic myDynamic = new JsonDynamicValue(JsonValue.Create(expectedValue));
 
         Assert.Equal(expectedValue, (Guid?)myDynamic);
@@ -530,7 +530,7 @@ public void JsonDynamicValueCanImplicitlyConvertToNullableDouble()
     [Fact]
     public void JsonDynamicValueCanImplicitlyConvertToGuid()
     {
-        Guid expectedValue = Guid.NewGuid();
+        Guid expectedValue = Ulid.NewUlid().ToGuid();
         dynamic myDynamic = new JsonDynamicValue(JsonValue.Create(expectedValue));
 
         Guid value = myDynamic;
@@ -543,7 +543,7 @@ public void JsonDynamicValueCanImplicitlyConvertToGuid()
     [Fact]
     public void JsonDynamicValueCanImplicitlyConvertToNullableGuid()
     {
-        Guid? expectedValue = Guid.NewGuid();
+        Guid? expectedValue = Ulid.NewUlid().ToGuid();
         dynamic myDynamic = new JsonDynamicValue(JsonValue.Create(expectedValue));
 
         Guid? value = myDynamic;

test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs

@@ -32,11 +32,11 @@ private static OpenIdServerSettings CreateSettings(string authority, OpenIdServe
 
             result.EncryptionCertificateStoreLocation = StoreLocation.LocalMachine;
             result.EncryptionCertificateStoreName = StoreName.My;
-            result.EncryptionCertificateThumbprint = Guid.NewGuid().ToString();
+            result.EncryptionCertificateThumbprint = Ulid.NewUlid().ToGuid().ToString();
 
             result.SigningCertificateStoreLocation = StoreLocation.LocalMachine;
             result.SigningCertificateStoreName = StoreName.My;
-            result.SigningCertificateThumbprint = Guid.NewGuid().ToString();
+            result.SigningCertificateThumbprint = Ulid.NewUlid().ToGuid().ToString();
 
             result.AllowAuthorizationCodeFlow = true;
             result.AllowClientCredentialsFlow = true;