From eb162745528f40166436f9b99d384092ee143c8e Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Fri, 4 Oct 2024 13:47:38 +0300
Subject: [PATCH] Use Ulid instead of Guid for better PERF

---
 Directory.Packages.props                      |   1 +
 .../AutoSetupMiddleware.cs                    |   2 +-
 .../OrchardCore.AutoSetup.csproj              |   4 +
 .../Views/ContentPickerField.Edit.cshtml      |  75 +++++---
 ...alizationSetContentPickerField.Edit.cshtml |  49 +++--
 .../Views/MultiTextField-Picker.Edit.cshtml   |  27 ++-
 .../Views/UserPickerField.Edit.cshtml         |  49 +++--
 .../Views/ContentPreview.Button.cshtml        |  11 +-
 ...ownload-Button-Actions.SummaryAdmin.cshtml |   6 +-
 .../OrchardCore.Demo/Views/DemoWidget.cshtml  |   2 +-
 .../OrchardCore.Demo/Views/OuterDoll.cshtml   |   2 +-
 .../OrchardCore.Deployment.Remote.csproj      |   4 +
 .../Services/RemoteClientService.cs           |   2 +-
 .../Services/RemoteInstanceService.cs         |   2 +-
 .../Controllers/StepController.cs             |   2 +-
 .../OrchardCore.Deployment.csproj             |   4 +
 .../CachedShapeWrapperShapes.cs               |   2 +-
 .../OrchardCore.DynamicCache.csproj           |   4 +
 .../TagHelpers/DynamicCacheTagHelper.cs       |   2 +-
 .../OrchardCore.Email.Smtp.csproj             |   1 +
 .../Services/SmtpEmailProviderBase.cs         |   2 +-
 .../Views/BagPart.Edit.cshtml                 |  44 ++---
 .../Views/FlowPart.Edit.cshtml                |  85 +++++----
 .../Views/Admin/Index.cshtml                  |   2 +-
 .../OrchardCore.Liquid.csproj                 |   4 +
 .../OrchardCore.Liquid/ScriptsMiddleware.cs   |   2 +-
 .../OrchardCore.OpenId.csproj                 |   1 +
 .../Services/OpenIdServerService.cs           |   2 +-
 .../Controllers/AdminController.cs            |   2 +-
 .../OrchardCore.Recipes.csproj                |   4 +
 .../Services/RecipeDeploymentTargetHandler.cs |   2 +-
 .../OrchardCore.Settings.csproj               |   4 +
 .../Services/SiteService.cs                   |   2 +-
 .../Views/TaxonomyField-Tags.Edit.cshtml      |  45 +++--
 .../Controllers/AdminController.cs            |   4 +-
 .../Controllers/TenantApiController.cs        |   4 +-
 .../OrchardCore.Tenants.csproj                |   1 +
 .../Workflows/Activities/CreateTenantTask.cs  |   2 +-
 .../Controllers/AccountController.cs          |   2 +-
 .../OrchardCore.Users.csproj                  |   4 +
 .../Views/ContentCard.cshtml                  |   8 +-
 .../Views/WidgetsListPart.Edit.cshtml         | 172 +++++++++---------
 .../Controllers/WorkflowTypeController.cs     |   2 +-
 .../OrchardCore.Workflows.csproj              |   9 +-
 .../OrchardCore.Abstractions/IdGenerator.cs   |   2 +-
 .../OrchardCore.Abstractions.csproj           |   1 +
 .../Models/AdminMenu.cs                       |   2 +-
 .../Models/AdminNode.cs                       |   2 +-
 .../OrchardCore.AdminMenu.Abstractions.csproj |   4 +
 .../Cache/CacheTag.cs                         |   2 +-
 ...rchardCore.DisplayManagement.Liquid.csproj |   6 +-
 .../Entities/DefaultIdGenerator.cs            |   2 +-
 .../OrchardCore.Infrastructure.csproj         |  11 +-
 .../OrchardCore.OpenId.Core.csproj            |   1 +
 .../YesSql/Stores/OpenIdApplicationStore.cs   |   2 +-
 .../YesSql/Stores/OpenIdAuthorizationStore.cs |   2 +-
 .../YesSql/Stores/OpenIdScopeStore.cs         |   2 +-
 .../YesSql/Stores/OpenIdTokenStore.cs         |   2 +-
 .../OrchardCore.Recipes.Core.csproj           |   4 +
 .../Services/RecipeExecutor.cs                |   2 +-
 .../Services/RecipeMigrator.cs                |   2 +-
 .../OrchardCore.Setup.Core.csproj             |   4 +
 .../OrchardCore.Setup.Core/SetupService.cs    |   2 +-
 .../Authentication/CacheTicketStore.cs        |   2 +-
 .../OrchardCore.Users.Core.csproj             |   1 +
 .../Apis/Context/SiteContext.cs               |   6 +-
 .../Data/JsonDynamicTests.cs                  |   8 +-
 .../OpenIdServerDeploymentSourceTests.cs      |   4 +-
 .../OrchardCore.Tests.csproj                  |   1 +
 .../AccountControllerTests.cs                 |   2 +-
 ...UserClaimsPrincipalProviderFactoryTests.cs |   2 +-
 .../OrchardCore.Users/UserValidatorTests.cs   |  16 +-
 .../Recipes/RecipeExecutorTests.cs            |   4 +-
 73 files changed, 440 insertions(+), 321 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 3d06fcdc244..c9e56ac6acb 100644
--- a/Directory.Packages.props
+++ b/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" />
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs
index 19411e2f406..b6dcc412968 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/AutoSetupMiddleware.cs
+++ b/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;
 
diff --git a/src/OrchardCore.Modules/OrchardCore.AutoSetup/OrchardCore.AutoSetup.csproj b/src/OrchardCore.Modules/OrchardCore.AutoSetup/OrchardCore.AutoSetup.csproj
index d7d0e22517b..331e4d92cb9 100644
--- a/src/OrchardCore.Modules/OrchardCore.AutoSetup/OrchardCore.AutoSetup.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.AutoSetup/OrchardCore.AutoSetup.csproj
@@ -17,4 +17,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Setup.Abstractions\OrchardCore.Setup.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
index 712431b2f8b..760e173a77e 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml
@@ -7,36 +7,69 @@
     var selectedItems = JConvert.SerializeObject(Model.SelectedItems, JOptions.CamelCase);
     var partName = Model.PartFieldDefinition.PartDefinition.Name;
     var fieldName = Model.PartFieldDefinition.Name;
-    var editUrl = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Edit", contentItemId = "contentItemId", returnUrl = FullRequestPath });
-    var viewUrl = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "Display", contentItemId = "contentItemId" });
-    var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "ContentPickerAdmin", action = "SearchContentItems", part = partName, field = fieldName });
-    var vueElementId = $"ContentPicker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
+    var editUrl = Url.RouteUrl(new
+    {
+        area = "OrchardCore.Contents",
+        controller = "Admin",
+        action = "Edit",
+        contentItemId =
+    "contentItemId",
+        returnUrl = FullRequestPath
+    });
+    var viewUrl = Url.RouteUrl(new
+    {
+        area = "OrchardCore.Contents",
+        controller = "Admin",
+        action = "Display",
+        contentItemId
+    = "contentItemId"
+    });
+    var searchUrl = Url.RouteUrl(new
+    {
+        area = "OrchardCore.ContentFields",
+        controller = "ContentPickerAdmin",
+        action =
+    "SearchContentItems",
+        part = partName,
+        field = fieldName
+    });
+    var vueElementId = $"ContentPicker_{partName}_{fieldName}_{Ulid.NewUlid().ToGuid().ToString("n")}";
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
+<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js"
+    at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
-    <label asp-for="ContentItemIds" class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)"
+    id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">
+    <label asp-for="ContentItemIds"
+        class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
-        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-edit-url="@editUrl" data-view-url="@viewUrl" data-search-url="@searchUrl" data-multiple="@multiple">
+        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName"
+            data-editor-type="ContentPicker" data-selected-items="@selectedItems" data-edit-url="@editUrl"
+            data-view-url="@viewUrl" data-search-url="@searchUrl" data-multiple="@multiple">
 
-            <ul class="mb-1 list-group w-lg-75 w-xxl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
+            <ul class="mb-1 list-group w-lg-75 w-xxl-50 content-picker-default__list" v-show="arrayOfItems.length"
+                v-cloak>
                 <draggable v-model="arrayOfItems">
                     <li v-for="(item, i) in arrayOfItems"
                         class="cursor-move list-group-item content-picker-default__list-item d-flex align-items-start justify-content-between"
                         :key="item.id">
                         <div class="align-items-center align-self-center">
                             <a v-if="item.isClickable" :href="url(item)" target="_blank">
-                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span>
+                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished"
+                                    class="text-muted small">(@T["Not published"])</span>
                             </a>
                             <span v-else>
-                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span>
+                                <span>{{ item.displayText }}</span> <span v-show="!item.hasPublished"
+                                    class="text-muted small">(@T["Not published"])</span>
                             </span>
                         </div>
                         <div class="btn-group btn-group-sm align-items-center" role="group">
-                            <button v-on:click="remove(item)" type="button" class="btn btn-secondary content-picker-default__list-item__delete"><i class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
+                            <button v-on:click="remove(item)" type="button"
+                                class="btn btn-secondary content-picker-default__list-item__delete"><i
+                                    class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
                         </div>
                     </li>
                 </draggable>
@@ -44,15 +77,14 @@
 
             <div class="w-lg-75 w-xxl-50">
                 <input asp-for="ContentItemIds" type="hidden" v-model="selectedIds" />
-                <vue-multiselect v-model="value" :options="options" track-by="id"
-                                 label="displayText" placeholder="@T["Type to search"]"
-                                 @@search-change="asyncFind" @@select="onSelect"
-                                 :searchable="true" :close-on-select="true" :reset-after="true"
-                                 :show-labels="true" :hide-selected="@multiple"
-                                 :disabled="isDisabled"
-                                 select-label="@T["Select"]" deselect-label="@T["Remove"]">
+                <vue-multiselect v-model="value" :options="options" track-by="id" label="displayText"
+                    placeholder="@T["Type to search"]" @@search-change="asyncFind" @@select="onSelect"
+                    :searchable="true" :close-on-select="true" :reset-after="true" :show-labels="true"
+                    :hide-selected="@multiple" :disabled="isDisabled" select-label="@T["Select"]"
+                    deselect-label="@T["Remove"]">
                     <template slot="option" slot-scope="props">
-                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
+                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2"
+                                v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
                     </template>
                     <template slot="noResult">
                         @T["No result found"]
@@ -66,4 +98,5 @@
         </div>
     </div>
 </div>
-<script at="Foot" depends-on="vue-multiselect-wrapper">initVueMultiselect(document.querySelector("#@vueElementId"))</script>
+<script at="Foot"
+    depends-on="vue-multiselect-wrapper">initVueMultiselect(document.querySelector("#@vueElementId"))</script>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
index efe4e7277e2..e2721bcf1be 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml
@@ -11,28 +11,43 @@
     var selectedItems = JConvert.SerializeObject(Model.SelectedItems, JOptions.CamelCase);
     var partName = Model.PartFieldDefinition.PartDefinition.Name;
     var fieldName = Model.PartFieldDefinition.Name;
-    var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "LocalizationSetContentPickerAdmin", action = "SearchLocalizationSets", part = partName, field = fieldName });
-    var vueElementId = $"LocalizedContentPicker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
+    var searchUrl = Url.RouteUrl(new
+    {
+        area = "OrchardCore.ContentFields",
+        controller = "LocalizationSetContentPickerAdmin",
+        action = "SearchLocalizationSets",
+        part = partName,
+        field = fieldName
+    });
+    var vueElementId = $"LocalizedContentPicker_{partName}_{fieldName}_{Ulid.NewUlid().ToGuid().ToString("n")}";
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
+<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js"
+    at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
-<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalizationSets)_FieldWrapper">
-    <label asp-for="LocalizationSets" class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)"
+    id="@Html.IdFor(x => x.LocalizationSets)_FieldWrapper">
+    <label asp-for="LocalizationSets"
+        class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
-        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-editor-type="LocalizationSetContentPicker" data-selected-items="@selectedItems" data-search-url="@searchUrl" data-multiple="@multiple">
+        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName"
+            data-editor-type="LocalizationSetContentPicker" data-selected-items="@selectedItems"
+            data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-xl-50 content-picker-default__list" v-show="arrayOfItems.length" v-cloak>
                 <draggable v-model="arrayOfItems">
                     <li v-for="(item, i) in arrayOfItems"
                         class="cursor-move list-group-item content-picker-default__list-item d-flex align-items-start justify-content-between"
                         :key="item.id">
-                        <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
+                        <div class="align-items-center align-self-center"><span>{{ item.displayText }}</span> <span
+                                v-show="!item.hasPublished" class="text-muted small">(@T["Not published"])</span></div>
 
                         <div class="btn-group btn-group-sm align-items-center" role="group">
-                            <button v-on:click="remove(item)" type="button" class="btn btn-secondary content-picker-default__list-item__delete"><i class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
+                            <button v-on:click="remove(item)" type="button"
+                                class="btn btn-secondary content-picker-default__list-item__delete"><i
+                                    class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
                         </div>
                     </li>
                 </draggable>
@@ -40,15 +55,14 @@
 
             <div class="w-xl-50">
                 <input asp-for="LocalizationSets" type="hidden" v-model="selectedIds" />
-                <vue-multiselect v-model="value" :options="options" track-by="id"
-                                 label="displayText" placeholder="@T["Type to search"]"
-                                 @@search-change="asyncFind" @@select="onSelect"
-                                 :searchable="true" :close-on-select="true" :reset-after="true"
-                                 :show-labels="true" :hide-selected="@multiple"
-                                 :disabled="isDisabled"
-                                 select-label="@T["Select"]" deselect-label="@T["Remove"]">
+                <vue-multiselect v-model="value" :options="options" track-by="id" label="displayText"
+                    placeholder="@T["Type to search"]" @@search-change="asyncFind" @@select="onSelect"
+                    :searchable="true" :close-on-select="true" :reset-after="true" :show-labels="true"
+                    :hide-selected="@multiple" :disabled="isDisabled" select-label="@T["Select"]"
+                    deselect-label="@T["Remove"]">
                     <template slot="option" slot-scope="props">
-                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
+                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2"
+                                v-show="!props.option.hasPublished">(@T["Not published"])</span></div>
                     </template>
                     <template slot="noResult">
                         @T["No result found"]
@@ -62,4 +76,5 @@
         </div>
     </div>
 </div>
-<script at="Foot" depends-on="vue-multiselect-wrapper">initVueMultiselect(document.querySelector("#@vueElementId"))</script>
+<script at="Foot"
+    depends-on="vue-multiselect-wrapper">initVueMultiselect(document.querySelector("#@vueElementId"))</script>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
index 521196e6534..755d26d0de4 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextField-Picker.Edit.cshtml
@@ -19,32 +19,27 @@
     var partName = Model.PartFieldDefinition.PartDefinition.Name;
     var fieldName = Model.PartFieldDefinition.Name;
 
-    var vueElementId = $"MultiTextField-Picker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
+    var vueElementId = $"MultiTextField-Picker_{partName}_{fieldName}_{Ulid.NewUlid().ToGuid().ToString("n")}";
 
     var valuesKey = Html.NameFor(x => x.Values);
 }
 
-<script asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.js" asp-name="multitextfieldpicker" at="Foot" depends-on="vuejs, vue-multiselect"></script>
+<script asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.min.js"
+    debug-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-multitextfieldpicker.js"
+    asp-name="multitextfieldpicker" at="Foot" depends-on="vuejs, vue-multiselect"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.Values)_FieldWrapper">
-    <label class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
+    <label
+        class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
-        <div id="@vueElementId" class="multitextfieldpicker" data-selectedvalues="@jSelectedValues" data-options="@jOptions" data-valueskey="@valuesKey">
+        <div id="@vueElementId" class="multitextfieldpicker" data-selectedvalues="@jSelectedValues"
+            data-options="@jOptions" data-valueskey="@valuesKey">
             <div class="w-xl-50">
                 <input v-for="v in value" v-bind:name="valuesKey" v-bind:value="v.value" type="hidden" />
-                <vue-multiselect v-model="value"
-                                 placeholder="@T["Type to search"]"
-                                 select-label="@T["Select"]"
-                                 deselect-label="@T["Remove"]"
-                                 track-by="value"
-                                 label="name"
-                                 :options="options"
-                                 :multiple="true"
-                                 :show-labels="false"
-                                 :close-on-select="false"
-                                 :taggable="true"
-                                 tag-position="bottom">
+                <vue-multiselect v-model="value" placeholder="@T["Type to search"]" select-label="@T["Select"]"
+                    deselect-label="@T["Remove"]" track-by="value" label="name" :options="options" :multiple="true"
+                    :show-labels="false" :close-on-select="false" :taggable="true" tag-position="bottom">
                     <template slot="noOptions">
                         @T["No values found"]
                     </template>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
index 8e1211960b3..72ac3cfc63c 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml
@@ -8,28 +8,45 @@
     var partName = Model.PartFieldDefinition.PartDefinition.Name;
     var fieldName = Model.PartFieldDefinition.Name;
     var contentTypeName = Model.TypePartDefinition.Name;
-    var searchUrl = Url.RouteUrl(new { area = "OrchardCore.ContentFields", controller = "UserPickerAdmin", action = "SearchUsers", part = partName, field = fieldName, contentType = contentTypeName });
-    var vueElementId = $"UserPicker_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
+    var searchUrl = Url.RouteUrl(new
+    {
+        area = "OrchardCore.ContentFields",
+        controller = "UserPickerAdmin",
+        action =
+    "SearchUsers",
+        part = partName,
+        field = fieldName,
+        contentType = contentTypeName
+    });
+    var vueElementId = $"UserPicker_{partName}_{fieldName}_{Ulid.NewUlid().ToGuid().ToString("n")}";
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-userpicker" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-userpicker.js" at="Foot" depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
+<script asp-name="vue-multiselect-userpicker"
+    asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-userpicker.js" at="Foot"
+    depends-on="vuejs, vue-multiselect, sortable, vuedraggable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.UserIds)_FieldWrapper">
-    <label asp-for="UserIds" class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
+    <label asp-for="UserIds"
+        class="@Orchard.GetLabelClasses(inputRequired: settings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
-        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName" data-content-type="@contentTypeName" data-editor-type="UserPicker" data-selected-users="@selectedUsers" data-search-url="@searchUrl" data-multiple="@multiple">
+        <div id="@vueElementId" class="vue-multiselect" data-part="@partName" data-field="@fieldName"
+            data-content-type="@contentTypeName" data-editor-type="UserPicker" data-selected-users="@selectedUsers"
+            data-search-url="@searchUrl" data-multiple="@multiple">
 
             <ul class="mb-1 list-group w-lg-75 w-xxl-50 user-picker-default__list" v-show="arrayOfUsers.length" v-cloak>
                 <draggable v-model="arrayOfUsers">
                     <li v-for="(user, i) in arrayOfUsers"
                         class="cursor-move list-group-item user-picker-default__list-item d-flex align-items-start justify-content-between"
                         :key="user.id">
-                        <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
+                        <div class="align-items-center align-self-center"><span>{{ user.displayText }}</span> <span
+                                v-show="!user.isEnabled" class="text-muted small">(@T["Not enabled"])</span></div>
 
                         <div class="btn-group btn-group-sm align-items-center" role="group">
-                            <button v-on:click="remove(user)" type="button" class="btn btn-secondary user-picker-default__list-item__delete"><i class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
+                            <button v-on:click="remove(user)" type="button"
+                                class="btn btn-secondary user-picker-default__list-item__delete"><i
+                                    class="fa-solid fa-trash fa-sm" aria-hidden="true"></i></button>
                         </div>
                     </li>
                 </draggable>
@@ -37,15 +54,14 @@
 
             <div class="w-lg-75 w-xxl-50">
                 <input asp-for="UserIds" type="hidden" v-model="selectedIds" />
-                <vue-multiselect v-model="value" :options="options" track-by="id"
-                                 label="displayText" placeholder="@T["Type to search"]"
-                                 @@search-change="asyncFind" @@select="onSelect"
-                                 :searchable="true" :close-on-select="true" :reset-after="true"
-                                 :show-labels="true" :hide-selected="@multiple"
-                                 :disabled="isDisabled"
-                                 select-label="@T["Select"]" deselect-label="@T["Remove"]">
+                <vue-multiselect v-model="value" :options="options" track-by="id" label="displayText"
+                    placeholder="@T["Type to search"]" @@search-change="asyncFind" @@select="onSelect"
+                    :searchable="true" :close-on-select="true" :reset-after="true" :show-labels="true"
+                    :hide-selected="@multiple" :disabled="isDisabled" select-label="@T["Select"]"
+                    deselect-label="@T["Remove"]">
                     <template slot="option" slot-scope="props">
-                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2" v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
+                        <div v-cloak><span>{{ props.option.displayText }}</span><span class="small ms-2"
+                                v-show="!props.option.isEnabled">(@T["Not enabled"])</span></div>
                     </template>
                     <template slot="noResult">
                         @T["No result found"]
@@ -63,4 +79,5 @@
 
     </div>
 </div>
-<script at="Foot" depends-on="vue-multiselect-userpicker">initVueMultiselectUserPicker(document.querySelector("#@vueElementId"))</script>
+<script at="Foot"
+    depends-on="vue-multiselect-userpicker">initVueMultiselectUserPicker(document.querySelector("#@vueElementId"))</script>
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/ContentPreview.Button.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/ContentPreview.Button.cshtml
index e05e37d8595..c8089519689 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/ContentPreview.Button.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentPreview/Views/ContentPreview.Button.cshtml
@@ -4,16 +4,19 @@
 
 @{
     ContentItem contentItem = Model.ContentItem;
-    var previewId = Guid.NewGuid();
-    var hasPreviewPermission = await AuthorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent, contentItem);
+    var previewId = Ulid.NewUlid().ToGuid();
+    var hasPreviewPermission = await AuthorizationService.AuthorizeAsync(User, CommonPermissions.PreviewContent,
+    contentItem);
 }
 
 @if (hasPreviewPermission)
 {
-    <a id="previewButton" target="_blank" class="btn btn-info mb-1" href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
+    <a id="previewButton" target="_blank" class="btn btn-info mb-1"
+        href="@Url.Action("Index", "Preview", new { area = "OrchardCore.ContentPreview", id = previewId })">@T["Preview"]</a>
 }
 
-<div id="renderPreviewUrl" style="display:none" data-value="@Url.Action("Render", "Preview", new { area = "OrchardCore.ContentPreview" })"></div>
+<div id="renderPreviewUrl" style="display:none"
+    data-value="@Url.Action("Render", "Preview", new { area = "OrchardCore.ContentPreview" })"></div>
 <div id="contentItemType" style="display:none" data-value="@Model.ContentItem.ContentType"></div>
 <div id="previewId" style="display:none" data-value="@previewId"></div>
 <div id="previewContentItemId" style="display:none" data-value="@Model.ContentItem.ContentItemId"></div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
index 3ad11fea2d3..1c956222e08 100644
--- a/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/Download-Button-Actions.SummaryAdmin.cshtml
@@ -4,9 +4,9 @@
     ContentItem contentItem = Model.ContentItem;
     var hasPublished = await ContentManager.HasPublishedVersionAsync(contentItem);
     var hasDraft = contentItem.HasDraft();
-    var exportId = Guid.NewGuid().ToString("n");
-    var exportPublishedId = Guid.NewGuid().ToString("n");
-    var exportDraftId = Guid.NewGuid().ToString("n");
+    var exportId = Ulid.NewUlid().ToGuid().ToString("n");
+    var exportPublishedId = Ulid.NewUlid().ToGuid().ToString("n");
+    var exportDraftId = Ulid.NewUlid().ToGuid().ToString("n");
 }
 
 <div class="dropdown-divider"></div>
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Views/DemoWidget.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Views/DemoWidget.cshtml
index d52239cb056..27696ef6b32 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Views/DemoWidget.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Views/DemoWidget.cshtml
@@ -1,4 +1,4 @@
 <article>
     <h3>Widget: @(Model.Title)</h3>
-    <p>@(Guid.NewGuid().ToString())</p>
+    <p>@(Ulid.NewUlid().ToGuid().ToString())</p>
 </article>
diff --git a/src/OrchardCore.Modules/OrchardCore.Demo/Views/OuterDoll.cshtml b/src/OrchardCore.Modules/OrchardCore.Demo/Views/OuterDoll.cshtml
index 968c8f4f633..bcc9ee059ba 100644
--- a/src/OrchardCore.Modules/OrchardCore.Demo/Views/OuterDoll.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Demo/Views/OuterDoll.cshtml
@@ -1,6 +1,6 @@
 @using OrchardCore.DisplayManagement.Shapes
 
-Outer Doll: @(Guid.NewGuid().ToString())
+Outer Doll: @(Ulid.NewUlid().ToGuid().ToString())
 <br />
 
 <shape typeof="innerdoll" cache-id="innerdoll" cache-context="query" cache-fixed-duration="00:00:10" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/OrchardCore.Deployment.Remote.csproj b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/OrchardCore.Deployment.Remote.csproj
index 8c1a77018ce..eeb5f48943a 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/OrchardCore.Deployment.Remote.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/OrchardCore.Deployment.Remote.csproj
@@ -24,4 +24,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs
index a3eaa361973..b6981282d3e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteClientService.cs
+++ b/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)),
         };
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs b/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs
index 4deb199f964..2cb77305faf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Services/RemoteInstanceService.cs
+++ b/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,
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs b/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs
index fb4d5a8c6a3..e7213a401bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/Controllers/StepController.cs
+++ b/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
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Deployment/OrchardCore.Deployment.csproj b/src/OrchardCore.Modules/OrchardCore.Deployment/OrchardCore.Deployment.csproj
index 6fcc560bfc0..7e80d36a3ca 100644
--- a/src/OrchardCore.Modules/OrchardCore.Deployment/OrchardCore.Deployment.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Deployment/OrchardCore.Deployment.csproj
@@ -26,4 +26,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+        <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs
index 0a19bc0e3e2..60006304185 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/CachedShapeWrapperShapes.cs
+++ b/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}");
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/OrchardCore.DynamicCache.csproj b/src/OrchardCore.Modules/OrchardCore.DynamicCache/OrchardCore.DynamicCache.csproj
index 01d9025cc4f..7f2b9f80c01 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/OrchardCore.DynamicCache.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.DynamicCache/OrchardCore.DynamicCache.csproj
@@ -19,4 +19,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs b/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs
index 69ec086cd9a..b86cb5e8a56 100644
--- a/src/OrchardCore.Modules/OrchardCore.DynamicCache/TagHelpers/DynamicCacheTagHelper.cs
+++ b/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}");
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
index c80c6b4672c..7990495db3e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
@@ -29,6 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="MailKit" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpEmailProviderBase.cs b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpEmailProviderBase.cs
index 8b54f667207..7be4f048e23 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpEmailProviderBase.cs
+++ b/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);
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
index 22d1dfb2abf..eea0060b17f 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/BagPart.Edit.cshtml
@@ -14,7 +14,9 @@
 <script asp-name="jQuery-ui" at="Foot"></script>
 
 <div>
-    <div id="@widgetTemplatePlaceholderId" class="widget-template-placeholder widget-template-placeholder-bagpart bagpart-@partName.HtmlClassify() row mx-0" data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Flows" })">
+    <div id="@widgetTemplatePlaceholderId"
+        class="widget-template-placeholder widget-template-placeholder-bagpart bagpart-@partName.HtmlClassify() row mx-0"
+        data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Flows" })">
         @{
             var index = 0;
             foreach (var widget in Model.AccessibleWidgets)
@@ -56,38 +58,29 @@
     {
         var type = Model.ContainedContentTypeDefinitions.First();
 
-        <a class="btn btn-primary add-widget btn-sm"
-       data-target-id="@widgetTemplatePlaceholderId"
-       data-html-field-prefix="@htmlFieldPrefix"
-       data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
-       data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
-       data-contentitems-name="@Html.NameFor(x => x.ContentItems)"
-       data-widget-type="@type.Name"
-       data-flowmetadata="false"
-       data-parent-content-type="@parentContentType"
-       data-part-name="@partName"
-       href="javascript:;">@T["Add {0}", type.DisplayName]</a>
+        <a class="btn btn-primary add-widget btn-sm" data-target-id="@widgetTemplatePlaceholderId"
+            data-html-field-prefix="@htmlFieldPrefix" data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
+            data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
+            data-contentitems-name="@Html.NameFor(x => x.ContentItems)" data-widget-type="@type.Name"
+            data-flowmetadata="false" data-parent-content-type="@parentContentType" data-part-name="@partName"
+            href="javascript:;">@T["Add {0}", type.DisplayName]</a>
     }
     else if (totalItems > 1)
     {
         <div class="btn-group btn-bag-add">
-            <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown"
+                aria-haspopup="true" aria-expanded="false">
                 @T["Add Item"]
             </button>
             <div class="dropdown-menu">
                 @foreach (var type in Model.ContainedContentTypeDefinitions)
                 {
-                    <a class="dropdown-item add-widget btn-sm"
-               data-target-id="@widgetTemplatePlaceholderId"
-               data-html-field-prefix="@htmlFieldPrefix"
-               data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
-               data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
-               data-contentitems-name="@Html.NameFor(x => x.ContentItems)"
-               data-widget-type="@type.Name"
-               data-flowmetadata="false"
-               data-parent-content-type="@parentContentType"
-               data-part-name="@partName"
-               href="javascript:;">@type.DisplayName</a>
+                    <a class="dropdown-item add-widget btn-sm" data-target-id="@widgetTemplatePlaceholderId"
+                        data-html-field-prefix="@htmlFieldPrefix" data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
+                        data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
+                        data-contentitems-name="@Html.NameFor(x => x.ContentItems)" data-widget-type="@type.Name"
+                        data-flowmetadata="false" data-parent-content-type="@parentContentType" data-part-name="@partName"
+                        href="javascript:;">@type.DisplayName</a>
                 }
             </div>
         </div>
@@ -110,7 +103,8 @@
 
             // Render a mock widget so that its resources are included in the page
             var contentItem = await ContentManager.NewAsync(type.Name);
-            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "", Guid.NewGuid().ToString("n")));
+            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "",
+            Ulid.NewUlid().ToGuid().ToString("n")));
         }
     }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml
index 8c587146c1d..bec36857604 100644
--- a/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Flows/Views/FlowPart.Edit.cshtml
@@ -17,7 +17,9 @@
 
 <script asp-name="jQuery-ui" at="Foot"></script>
 <div>
-    <div id="@widgetTemplatePlaceholderId" class="widget-template-placeholder widget-template-placeholder-flowpart flowpart-@partName.HtmlClassify() row mx-0" data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Flows" })">
+    <div id="@widgetTemplatePlaceholderId"
+        class="widget-template-placeholder widget-template-placeholder-flowpart flowpart-@partName.HtmlClassify() row mx-0"
+        data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Flows" })">
         @{
             var index = 0;
             foreach (var widget in Model.FlowPart.Widgets)
@@ -27,34 +29,34 @@
 
                 //Create a Card Shape
                 dynamic contentCard = await New.ContentCard(
-                    //For Updater
-                    CollectionShape: Model,
-                    //Shape Specific
-                    CollectionShapeType: nameof(FlowPart),
-                    ContentItem: widget,
-                    BuildEditor: true,
-                    ParentContentType: parentContentType,
-                    ContainedContentTypes: Model.ContainedContentTypeDefinitions,
-                    CollectionPartName: partName,
-                    //FlowPart Card Specific - For Frame
-                    ColumnSize: colSize,
-                    //Card Specific Properties
-                    TargetId: widgetTemplatePlaceholderId,
-                    Inline: false,
-                    CanMove: true,
-                    CanDelete: true,
-                    //Input hidden
-                    //Prefixes
-                    HtmlFieldPrefix: htmlFieldPrefix,
-                    PrefixValue: htmlFieldPrefix + '-' + (index++).ToString(),
-                    PrefixesId: Html.IdFor(x => x.Prefixes),
-                    PrefixesName: Html.NameFor(x => x.Prefixes),
-                    //Content Types
-                    ContentTypesId: Html.IdFor(x => x.ContentTypes),
-                    ContentTypesName: Html.NameFor(x => x.ContentTypes),
-                    //Content Items
-                    ContentItemsId: Html.IdFor(x => x.ContentItems),
-                    ContentItemsName: Html.NameFor(x => x.ContentItems)
+                //For Updater
+                CollectionShape: Model,
+                //Shape Specific
+                CollectionShapeType: nameof(FlowPart),
+                ContentItem: widget,
+                BuildEditor: true,
+                ParentContentType: parentContentType,
+                ContainedContentTypes: Model.ContainedContentTypeDefinitions,
+                CollectionPartName: partName,
+                //FlowPart Card Specific - For Frame
+                ColumnSize: colSize,
+                //Card Specific Properties
+                TargetId: widgetTemplatePlaceholderId,
+                Inline: false,
+                CanMove: true,
+                CanDelete: true,
+                //Input hidden
+                //Prefixes
+                HtmlFieldPrefix: htmlFieldPrefix,
+                PrefixValue: htmlFieldPrefix + '-' + (index++).ToString(),
+                PrefixesId: Html.IdFor(x => x.Prefixes),
+                PrefixesName: Html.NameFor(x => x.Prefixes),
+                //Content Types
+                ContentTypesId: Html.IdFor(x => x.ContentTypes),
+                ContentTypesName: Html.NameFor(x => x.ContentTypes),
+                //Content Items
+                ContentItemsId: Html.IdFor(x => x.ContentItems),
+                ContentItemsName: Html.NameFor(x => x.ContentItems)
                 );
                 @await DisplayAsync(contentCard)
             }
@@ -63,7 +65,8 @@
     <div class="btn-widget-add-below-wrapper w-100 my-2">
         <div class="btn-widget-add-below w-100 border border-info">
             <div class="btn-group">
-                <button type="button" title="@T["Add Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <button type="button" title="@T["Add Widget"]" class="btn btn-primary btn-sm dropdown-toggle"
+                    data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <i class="fa-solid fa-plus" aria-hidden="true"></i>
                 </button>
                 <div class="dropdown-menu">
@@ -75,17 +78,12 @@
                     {
                         @foreach (var type in widgetContentTypes.OrderBy(w => w.DisplayName))
                         {
-                            <a class="dropdown-item add-widget btn-sm"
-                            data-target-id="@widgetTemplatePlaceholderId"
-                            data-html-field-prefix="@htmlFieldPrefix"
-                            data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
-                            data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
-                            data-contentitems-name="@Html.NameFor(x => x.ContentItems)"
-                            data-widget-type="@type.Name"
-                            data-flowmetadata="true"
-                            data-parent-content-type="@parentContentType"
-                            data-part-name="@partName"
-                            href="javascript:;">@type.DisplayName</a>
+                            <a class="dropdown-item add-widget btn-sm" data-target-id="@widgetTemplatePlaceholderId"
+                                data-html-field-prefix="@htmlFieldPrefix" data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
+                                data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
+                                data-contentitems-name="@Html.NameFor(x => x.ContentItems)" data-widget-type="@type.Name"
+                                data-flowmetadata="true" data-parent-content-type="@parentContentType"
+                                data-part-name="@partName" href="javascript:;">@type.DisplayName</a>
                         }
                     }
                 </div>
@@ -99,9 +97,10 @@
         {
             // Render a mock widget so that its resources are included in the page
             var contentItem = await ContentManager.NewAsync(type.Name);
-            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "", Guid.NewGuid().ToString("n")));
+            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "",
+            Ulid.NewUlid().ToGuid().ToString("n")));
         }
-        
+
         <script asp-name="flowpart-edit" at="Foot"></script>
         <style asp-name="flowpart-edit" at="Head"></style>
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml b/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
index 490664920a3..59416cf8fd4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Layers/Views/Admin/Index.cshtml
@@ -72,7 +72,7 @@
 
                                 if (widgetContentTypes.Count > 0)
                                 {
-                                    var htmlId = Guid.NewGuid().ToString("n");
+                                    var htmlId = Ulid.NewUlid().ToGuid().ToString("n");
 
                                     <div class="dropdown">
                                         <button type="button" class="btn btn-primary btn-sm dropdown-toggle" id="@htmlId" data-bs-toggle="dropdown" aria-expanded="false">
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/OrchardCore.Liquid.csproj b/src/OrchardCore.Modules/OrchardCore.Liquid/OrchardCore.Liquid.csproj
index 82b5fc4ea23..f6f674974ee 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/OrchardCore.Liquid.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Liquid/OrchardCore.Liquid.csproj
@@ -26,4 +26,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs b/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs
index 6c5c148f961..7f76e0a4830 100644
--- a/src/OrchardCore.Modules/OrchardCore.Liquid/ScriptsMiddleware.cs
+++ b/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);
                 }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/OrchardCore.OpenId.csproj b/src/OrchardCore.Modules/OrchardCore.OpenId/OrchardCore.OpenId.csproj
index cb676217dd9..e2c9a716590 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/OrchardCore.OpenId.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.OpenId/OrchardCore.OpenId.csproj
@@ -36,6 +36,7 @@
     <PackageReference Include="OpenIddict.Validation.AspNetCore" />
     <PackageReference Include="OpenIddict.Validation.DataProtection" />
     <PackageReference Include="OpenIddict.Validation.SystemNetHttp" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs b/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs
index e21f0702bf4..5d9cdf2d610 100644
--- a/src/OrchardCore.Modules/OrchardCore.OpenId/Services/OpenIdServerService.cs
+++ b/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));
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
index 4c3645d99fa..ab0a691c09d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Controllers/AdminController.cs
+++ b/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);
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/OrchardCore.Recipes.csproj b/src/OrchardCore.Modules/OrchardCore.Recipes/OrchardCore.Recipes.csproj
index e8aef0c45bb..952afaf9b34 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/OrchardCore.Recipes.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Recipes/OrchardCore.Recipes.csproj
@@ -25,4 +25,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs b/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs
index e520702b977..7c95508e368 100644
--- a/src/OrchardCore.Modules/OrchardCore.Recipes/Services/RecipeDeploymentTargetHandler.cs
+++ b/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,
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/OrchardCore.Settings.csproj b/src/OrchardCore.Modules/OrchardCore.Settings/OrchardCore.Settings.csproj
index 852763a82ec..12d49f3b0f1 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/OrchardCore.Settings.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Settings/OrchardCore.Settings.csproj
@@ -27,4 +27,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Setup.Abstractions\OrchardCore.Setup.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs b/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs
index f0afe5ef175..3667a23468e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Settings/Services/SiteService.cs
+++ b/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,
diff --git a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
index c099da33903..6c77e1c0738 100644
--- a/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Taxonomies/Views/TaxonomyField-Tags.Edit.cshtml
@@ -21,14 +21,20 @@
         open = false;
     }
 
-    var vueElementId = $"TaxonomyField-Tags_{partName}_{fieldName}_{Guid.NewGuid().ToString("n")}";
+    var vueElementId = $"TaxonomyField-Tags_{partName}_{fieldName}_{Ulid.NewUlid().ToGuid().ToString("n")}";
 }
 
-<script asp-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.min.js" debug-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.js" asp-name="tags-editor" at="Foot" depends-on="vuejs, vue-multiselect"></script>
-<style asp-src="~/OrchardCore.Taxonomies/Styles/tags-editor.min.css" debug-src="~/OrchardCore.Taxonomies/Styles/tags-editor.css" asp-name="tags-editor" depends-on="vue-multiselect"></style>
+<script asp-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.min.js"
+    debug-src="~/OrchardCore.Taxonomies/Scripts/tags-editor.js" asp-name="tags-editor" at="Foot"
+    depends-on="vuejs, vue-multiselect"></script>
+<style asp-src="~/OrchardCore.Taxonomies/Styles/tags-editor.min.css"
+    debug-src="~/OrchardCore.Taxonomies/Styles/tags-editor.css" asp-name="tags-editor" depends-on="vue-multiselect">
+</style>
 
-<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.TermContentItemIds)_FieldWrapper">
-    <label class="@Orchard.GetLabelClasses(inputRequired: taxonomySettings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
+<div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)"
+    id="@Html.IdFor(x => x.TermContentItemIds)_FieldWrapper">
+    <label
+        class="@Orchard.GetLabelClasses(inputRequired: taxonomySettings.Required)">@Model.PartFieldDefinition.DisplayName()</label>
     <div class="@Orchard.GetEndClasses()">
         @if (!string.IsNullOrEmpty(taxonomySettings.Hint))
         {
@@ -43,28 +49,21 @@
         }
         else
         {
-            <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId" data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()" data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries" data-create-tag-url="@createTagUrl">
+            <div id="@vueElementId" class="tags" data-taxonomy-content-item-id="@Model.Taxonomy.ContentItemId"
+                data-open="@open.ToString().ToLower()" data-leaves-only="@taxonomySettings.LeavesOnly.ToString().ToLower()"
+                data-create-tag-error-message="@T["Error creating tag"]" data-all-tag-terms="@Model.TagTermEntries"
+                data-create-tag-url="@createTagUrl">
 
                 <div class="w-100">
                     <input asp-for="TermContentItemIds" type="hidden" v-model="selectedTagTermsIds" />
 
-                    <vue-multiselect v-model="selectedTagTerms"
-                                 placeholder="@T["Type to search"]"
-                                 select-label="@T["Select"]"
-                                 deselect-label="@T["Remove"]"
-                                 :options="selectableTagTerms"
-                                 :multiple="@((!taxonomySettings.Unique).ToString().ToLower())"
-                                 :show-labels="false"
-                                 :close-on-select="@taxonomySettings.Unique.ToString().ToLower()"
-                                 :disabled="isDisabled"
-                                 track-by="contentItemId"
-                                 label="displayText"
-                                 @@select="onSelect"
-                                 @@remove="onRemove"
-                                 :taggable="@open.ToString().ToLower()"
-                                 tag-position="bottom"
-                                 tag-placeholder="@T["Press enter to create a tag"]"
-                                 @@tag="createTagTerm">
+                    <vue-multiselect v-model="selectedTagTerms" placeholder="@T["Type to search"]"
+                        select-label="@T["Select"]" deselect-label="@T["Remove"]" :options="selectableTagTerms"
+                        :multiple="@((!taxonomySettings.Unique).ToString().ToLower())" :show-labels="false"
+                        :close-on-select="@taxonomySettings.Unique.ToString().ToLower()" :disabled="isDisabled"
+                        track-by="contentItemId" label="displayText" @@select="onSelect" @@remove="onRemove"
+                        :taggable="@open.ToString().ToLower()" tag-position="bottom"
+                        tag-placeholder="@T["Press enter to create a tag"]" @@tag="createTagTerm">
                         <template slot="noResult">
                             @T["No tags found"]
                         </template>
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
index b91f9a6c6bc..24e9b10ac27 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/AdminController.cs
+++ b/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);
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
index 807de7149eb..56f9b635609 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Controllers/TenantApiController.cs
+++ b/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);
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj b/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
index 1fb833662eb..8689c8e17c4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Tenants/OrchardCore.Tenants.csproj
@@ -32,6 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="NJsonSchema" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs
index aa0cff7235e..299e0c6cae3 100644
--- a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/CreateTenantTask.cs
+++ b/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);
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs b/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
index a649db233e7..dc8aeb60a94 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
+++ b/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()
diff --git a/src/OrchardCore.Modules/OrchardCore.Users/OrchardCore.Users.csproj b/src/OrchardCore.Modules/OrchardCore.Users/OrchardCore.Users.csproj
index eaaf839674a..8409dde35bb 100644
--- a/src/OrchardCore.Modules/OrchardCore.Users/OrchardCore.Users.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Users/OrchardCore.Users.csproj
@@ -40,4 +40,8 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Setup.Abstractions\OrchardCore.Setup.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Workflows.Abstractions\OrchardCore.Workflows.Abstractions.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
index 226c3b7f7a7..e4fbb4e2685 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/ContentCard.cshtml
@@ -20,13 +20,14 @@
             //Assign prefix
             if (string.IsNullOrEmpty(Model.PrefixValue))
             {
-                Model.PrefixValue = Guid.NewGuid().ToString("n");
+                Model.PrefixValue = Ulid.NewUlid().ToGuid().ToString("n");
             }
 
             //Build Editor for Content Item
             // AJAX request is new request and will not have CollectionShape.
             var isNew = Model.CollectionShape == null ? true : false;
-            IShape contentItemEditor = await ContentItemDisplayManager.BuildEditorAsync(contentItem, updater, isNew, string.Empty, Model.PrefixValue);
+            IShape contentItemEditor = await ContentItemDisplayManager.BuildEditorAsync(contentItem, updater, isNew, string.Empty,
+            Model.PrefixValue);
 
             //We don't show Actions and Side bar the parent editor has its own buttons.
             contentItemEditor.Properties["Actions"] = null;
@@ -49,7 +50,8 @@
         else
         {
             //Just Create Preview
-            Model.ContentPreview = await ContentItemDisplayManager.BuildDisplayAsync(contentItem, updater, Model.DisplayType ?? "Detail");
+            Model.ContentPreview = await ContentItemDisplayManager.BuildDisplayAsync(contentItem, updater, Model.DisplayType ??
+            "Detail");
 
             //Hide the Delete
             Model.CanDelete = false;
diff --git a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml
index b73aa30bd1e..fd986dc2f2e 100644
--- a/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.Widgets/Views/WidgetsListPart.Edit.cshtml
@@ -12,7 +12,8 @@
 
 @{
     var htmlFieldPrefix = ViewContext.ViewData.TemplateInfo.HtmlFieldPrefix;
-    var widgetContentTypes = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.GetStereotype() == "Widget");
+    var widgetContentTypes = (await ContentDefinitionManager.ListTypeDefinitionsAsync()).Where(t => t.GetStereotype() ==
+    "Widget");
     var parentContentType = Model.WidgetsListPart.ContentItem.ContentType;
     string partName = ((dynamic)Model).Metadata.Name;
 }
@@ -22,15 +23,17 @@
 <div>
     @foreach (var zone in Model.AvailableZones)
     {
-        var widgetTemplatePlaceholderId = Guid.NewGuid().ToString("n");
+        var widgetTemplatePlaceholderId = Ulid.NewUlid().ToGuid().ToString("n");
 
-            <div class="widget-list-zone card my-2">
-                <div class="card-header text-muted">
+        <div class="widget-list-zone card my-2">
+            <div class="card-header text-muted">
                 @zone
-                </div>
-                <div class="widget-editor-body card-body" data-zone="@zone">
-                    <div class="w-100 mb-3">
-                        <div id="@widgetTemplatePlaceholderId" class="widget-template-placeholder widget-template-placeholder-widget-list @( ($"widgetlist-{partName}-{zone}").HtmlClassify() ) row mx-0" data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Widgets" })">
+            </div>
+            <div class="widget-editor-body card-body" data-zone="@zone">
+                <div class="w-100 mb-3">
+                    <div id="@widgetTemplatePlaceholderId"
+                        class="widget-template-placeholder widget-template-placeholder-widget-list @( ($"widgetlist-{partName}-{zone}").HtmlClassify() ) row mx-0"
+                        data-buildeditorurl="@Url.Action("BuildEditor", "Admin", new { area = "OrchardCore.Widgets" })">
 
                         @if (Model.WidgetsListPart.Widgets.ContainsKey(zone))
                         {
@@ -74,89 +77,89 @@
                             }
                         }
 
-                            <script at="Foot">
-                                @*Only apply sortable if element is present in dom, do not call sortable on scripts for mock widgets *@
-                                if ($('#@widgetTemplatePlaceholderId').length == 1) {
-                                    $("#@widgetTemplatePlaceholderId").sortable({
-                                        handle: ".widget-editor-handle",
-                                        cursor: "move",
-                                        opacity: 0.7,
-                                        tolerance: "pointer",
-                                        placeholder: {
-                                            element: function (currentItem) {
-                                                return $('<div class="widget-dragdrop-placeholder"><div></div></div>')[0];
-                                            },
-                                            update: function (container, p) {
-                                                return;
-                                            }
-                                        },
-                                        toleranceElement: '> div',
-                                        connectWith: '.widget-template-placeholder.widget-template-placeholder-widget-list',
-                                        receive: function (event, ui) {
-                                            var newZone = ui.item.closest('.widget-editor-body').data("zone");
-                                            var zoneInput = ui.item.find('.source-zone').val(newZone);
-                                        },
-                                        start: function (event, ui) {
-                                            widgetDragItem = ui.item;
-                                            lastContainer = ui.item.parent();
-                                            lastContainer.toggleClass('widget-dropzone-hint');
-                                            widgetDragItem.find('.card').first().toggleClass('border-primary');
-                                            var classList = widgetDragItem.attr('class').split(' ');
-                                            $.each(classList, function (id, item) {
-                                                if (item.indexOf('col-md-') === 0) ui.placeholder.addClass(item);
-                                            });
-                                        },
-                                        stop: function (event, ui) {
-                                            lastContainer.toggleClass('widget-dropzone-hint');
-                                            widgetDragItem.find('.card').first().toggleClass('border-primary');
-                                            //clear the global variables
-                                            widgetDragItem = null;
-                                            lastContainer = null;
-                                            widgetItemSourceId = null;
-                                            widgetItemDestId = null;
-                                            $(document).trigger('contentpreview:render');
+                        <script at="Foot">
+                            @*Only apply sortable if element is present in dom, do not call sortable on scripts for mock widgets *@
+                                    if ($('#@widgetTemplatePlaceholderId').length == 1) {
+                                $("#@widgetTemplatePlaceholderId").sortable({
+                                    handle: ".widget-editor-handle",
+                                    cursor: "move",
+                                    opacity: 0.7,
+                                    tolerance: "pointer",
+                                    placeholder: {
+                                        element: function (currentItem) {
+                                            return $('<div class="widget-dragdrop-placeholder"><div></div></div>')[0];
                                         },
-                                        over: function (event, ui) {
-                                            var $self = $(this);
-                                            if (lastContainer[0] != this) {
-                                                lastContainer.toggleClass('widget-dropzone-hint');
-                                                lastContainer = $self;
-                                                $self.toggleClass('widget-dropzone-hint');
-                                            }
+                                        update: function (container, p) {
+                                            return;
                                         }
-                                    });
-                                }
-                            </script>
-                        </div>
-                        <div class="btn-widget-add-below-wrapper w-100 my-2">
-                            <div class="btn-widget-add-below w-100 border border-info">
-                                <div class="btn-group ">
-                                    <button type="button" title="@T["Add Widget"]" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="fa-solid fa-plus" aria-hidden="true"></i>
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        @foreach (var type in widgetContentTypes.OrderBy(w => w.DisplayName))
-                                        {
-                                                <a class="dropdown-item add-list-widget btn-sm"
-                                   data-target-id="@widgetTemplatePlaceholderId"
-                                   data-html-field-prefix="@htmlFieldPrefix"
-                                   data-zones-name="@Html.NameFor(x => x.Zones)"
-                                   data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
-                                   data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
-                                   data-contentitems-name="@Html.NameFor(x => x.ContentItems)"
-                                   data-widget-type="@type.Name"
-                                   data-parent-content-type="@parentContentType"
-                                   data-part-name="@partName"
-                                   data-zone="@zone"
-                                   href="javascript:;">@type.DisplayName</a>
+                                    },
+                                    toleranceElement: '> div',
+                                    connectWith: '.widget-template-placeholder.widget-template-placeholder-widget-list',
+                                    receive: function (event, ui) {
+                                        var newZone = ui.item.closest('.widget-editor-body').data("zone");
+                                        var zoneInput = ui.item.find('.source-zone').val(newZone);
+                                    },
+                                    start: function (event, ui) {
+                                        widgetDragItem = ui.item;
+                                        lastContainer = ui.item.parent();
+                                        lastContainer.toggleClass('widget-dropzone-hint');
+                                        widgetDragItem.find('.card').first().toggleClass('border-primary');
+                                        var classList = widgetDragItem.attr('class').split(' ');
+                                        $.each(classList, function (id, item) {
+                                            if (item.indexOf('col-md-') === 0) ui.placeholder.addClass(item);
+                                        });
+                                    },
+                                    stop: function (event, ui) {
+                                        lastContainer.toggleClass('widget-dropzone-hint');
+                                        widgetDragItem.find('.card').first().toggleClass('border-primary');
+                                        //clear the global variables
+                                        widgetDragItem = null;
+                                        lastContainer = null;
+                                        widgetItemSourceId = null;
+                                        widgetItemDestId = null;
+                                        $(document).trigger('contentpreview:render');
+                                    },
+                                    over: function (event, ui) {
+                                        var $self = $(this);
+                                        if (lastContainer[0] != this) {
+                                            lastContainer.toggleClass('widget-dropzone-hint');
+                                            lastContainer = $self;
+                                            $self.toggleClass('widget-dropzone-hint');
                                         }
-                                    </div>
+                                    }
+                                });
+                            }
+                        </script>
+                    </div>
+                    <div class="btn-widget-add-below-wrapper w-100 my-2">
+                        <div class="btn-widget-add-below w-100 border border-info">
+                            <div class="btn-group ">
+                                <button type="button" title="@T["Add Widget"]"
+                                    class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown"
+                                    aria-haspopup="true" aria-expanded="false">
+                                    <i class="fa-solid fa-plus" aria-hidden="true"></i>
+                                </button>
+                                <div class="dropdown-menu">
+                                    @foreach (var type in widgetContentTypes.OrderBy(w => w.DisplayName))
+                                    {
+                                        <a class="dropdown-item add-list-widget btn-sm"
+                                            data-target-id="@widgetTemplatePlaceholderId"
+                                            data-html-field-prefix="@htmlFieldPrefix"
+                                            data-zones-name="@Html.NameFor(x => x.Zones)"
+                                            data-prefixes-name="@Html.NameFor(x => x.Prefixes)"
+                                            data-contenttypes-name="@Html.NameFor(x => x.ContentTypes)"
+                                            data-contentitems-name="@Html.NameFor(x => x.ContentItems)"
+                                            data-widget-type="@type.Name" data-parent-content-type="@parentContentType"
+                                            data-part-name="@partName" data-zone="@zone"
+                                            href="javascript:;">@type.DisplayName</a>
+                                    }
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
     }
 
     @if (Context.Items["WidgetsListPart.Edit"] == null)
@@ -166,9 +169,10 @@
         {
             // Render a mock widget so that its resources are included in the page
             var contentItem = await ContentManager.NewAsync(type.Name);
-            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "", Guid.NewGuid().ToString("n")));
+            await DisplayAsync(await ContentItemDisplayManager.BuildEditorAsync(contentItem, Model.Updater, true, "",
+            Ulid.NewUlid().ToGuid().ToString("n")));
         }
-        
+
         <script asp-name="widgetslist-edit" at="Foot"></script>
         <style asp-name="widgetslist-edit" at="Head"></style>
     }
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs b/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
index 3f3d0b418f6..297d78a5db5 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/Controllers/WorkflowTypeController.cs
+++ b/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);
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Workflows/OrchardCore.Workflows.csproj b/src/OrchardCore.Modules/OrchardCore.Workflows/OrchardCore.Workflows.csproj
index 115f0978630..bd0c7746d92 100644
--- a/src/OrchardCore.Modules/OrchardCore.Workflows/OrchardCore.Workflows.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Workflows/OrchardCore.Workflows.csproj
@@ -15,10 +15,6 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ncrontab" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Admin.Abstractions\OrchardCore.Admin.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ContentManagement.Abstractions\OrchardCore.ContentManagement.Abstractions.csproj" />
@@ -37,6 +33,11 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Workflows.Abstractions\OrchardCore.Workflows.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="ncrontab" />
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
   <ItemGroup>
     <TypeScriptCompile Include="Assets\Lib\jquery\typings.d.ts" />
     <TypeScriptCompile Include="Assets\Lib\jsplumb\typings.d.ts" />
diff --git a/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs b/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs
index 72a5fae51c7..a064f94826a 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/IdGenerator.cs
+++ b/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) =>
         {
diff --git a/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj b/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj
index 3f580b270c1..d1e0af46c34 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj
+++ b/src/OrchardCore/OrchardCore.Abstractions/OrchardCore.Abstractions.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="JsonPath.Net" />
+    <PackageReference Include="Ulid" />
     <PackageReference Include="ZString" />
   </ItemGroup>
 
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs
index 51031d870a4..7c75e91525a 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminMenu.cs
+++ b/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; } = [];
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs
index db35f3fc00f..e9399034fd3 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/Models/AdminNode.cs
+++ b/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)
diff --git a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/OrchardCore.AdminMenu.Abstractions.csproj b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/OrchardCore.AdminMenu.Abstractions.csproj
index 45768553b01..6fe3244ebb9 100644
--- a/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/OrchardCore.AdminMenu.Abstractions.csproj
+++ b/src/OrchardCore/OrchardCore.AdminMenu.Abstractions/OrchardCore.AdminMenu.Abstractions.csproj
@@ -19,5 +19,9 @@
     <ProjectReference Include="..\OrchardCore.Navigation.Core\OrchardCore.Navigation.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
 
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs
index 5d16f4d6d5e..93bfb353dd9 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/Cache/CacheTag.cs
+++ b/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}");
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCore.DisplayManagement.Liquid.csproj b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCore.DisplayManagement.Liquid.csproj
index b4e2563e947..974d4b1813a 100644
--- a/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCore.DisplayManagement.Liquid.csproj
+++ b/src/OrchardCore/OrchardCore.DisplayManagement.Liquid/OrchardCore.DisplayManagement.Liquid.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
 
@@ -21,4 +21,8 @@
     <ProjectReference Include="..\OrchardCore.ResourceManagement.Abstractions\OrchardCore.ResourceManagement.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs b/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs
index 019c26b5f79..687cc9b3029 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/Entities/DefaultIdGenerator.cs
+++ b/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);
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj b/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
index d0701e3871d..cd541482c03 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
+++ b/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
@@ -13,15 +13,16 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="HtmlSanitizer" />
-    <PackageReference Include="MimeKit" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\OrchardCore\OrchardCore.csproj" />
     <ProjectReference Include="..\OrchardCore.Data.YesSql\OrchardCore.Data.YesSql.csproj" />
     <ProjectReference Include="..\OrchardCore.Infrastructure.Abstractions\OrchardCore.Infrastructure.Abstractions.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="HtmlSanitizer" />
+    <PackageReference Include="MimeKit" />
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/OrchardCore.OpenId.Core.csproj b/src/OrchardCore/OrchardCore.OpenId.Core/OrchardCore.OpenId.Core.csproj
index fa80d2c069a..8a20412b55e 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/OrchardCore.OpenId.Core.csproj
+++ b/src/OrchardCore/OrchardCore.OpenId.Core/OrchardCore.OpenId.Core.csproj
@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="OpenIddict.Core" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs
index f1dabda01ad..052c4c0a1d0 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdApplicationStore.cs
+++ b/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)
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs
index d48974c4f7d..03983a43a08 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdAuthorizationStore.cs
+++ b/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)
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs
index 2173cf8f254..5aeac365c8b 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdScopeStore.cs
+++ b/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)
diff --git a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs b/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs
index eaa3c46165d..6ebda264b9a 100644
--- a/src/OrchardCore/OrchardCore.OpenId.Core/YesSql/Stores/OpenIdTokenStore.cs
+++ b/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)
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/OrchardCore.Recipes.Core.csproj b/src/OrchardCore/OrchardCore.Recipes.Core/OrchardCore.Recipes.Core.csproj
index 975475f4b76..6e05b267e24 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/OrchardCore.Recipes.Core.csproj
+++ b/src/OrchardCore/OrchardCore.Recipes.Core/OrchardCore.Recipes.Core.csproj
@@ -20,4 +20,8 @@
     <ProjectReference Include="..\OrchardCore.Recipes.Abstractions\OrchardCore.Recipes.Abstractions.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs
index a79c53444e7..8d99450b28c 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeExecutor.cs
+++ b/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);
                                 }
diff --git a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs b/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs
index c44075fd72b..435e9c0851b 100644
--- a/src/OrchardCore/OrchardCore.Recipes.Core/Services/RecipeMigrator.cs
+++ b/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);
     }
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/OrchardCore.Setup.Core.csproj b/src/OrchardCore/OrchardCore.Setup.Core/OrchardCore.Setup.Core.csproj
index f30f1986018..0d217e7a0b2 100644
--- a/src/OrchardCore/OrchardCore.Setup.Core/OrchardCore.Setup.Core.csproj
+++ b/src/OrchardCore/OrchardCore.Setup.Core/OrchardCore.Setup.Core.csproj
@@ -19,4 +19,8 @@
     <ProjectReference Include="..\OrchardCore.Recipes.Abstractions\OrchardCore.Recipes.Abstractions.csproj" />
     <ProjectReference Include="..\OrchardCore.Setup.Abstractions\OrchardCore.Setup.Abstractions.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Ulid" />
+  </ItemGroup>
 </Project>
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs b/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
index 5f8df19375c..835eeb5a140 100644
--- a/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
+++ b/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
diff --git a/src/OrchardCore/OrchardCore.Users.Core/Authentication/CacheTicketStore.cs b/src/OrchardCore/OrchardCore.Users.Core/Authentication/CacheTicketStore.cs
index 890e061dd53..9881fb87367 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/Authentication/CacheTicketStore.cs
+++ b/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
diff --git a/src/OrchardCore/OrchardCore.Users.Core/OrchardCore.Users.Core.csproj b/src/OrchardCore/OrchardCore.Users.Core/OrchardCore.Users.Core.csproj
index a4b769e6d3a..ca1f057ecf1 100644
--- a/src/OrchardCore/OrchardCore.Users.Core/OrchardCore.Users.Core.csproj
+++ b/src/OrchardCore/OrchardCore.Users.Core/OrchardCore.Users.Core.csproj
@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="YesSql.Filters.Query" />
+    <PackageReference Include="Ulid" />
   </ItemGroup>
 
 </Project>
diff --git a/test/OrchardCore.Tests/Apis/Context/SiteContext.cs b/test/OrchardCore.Tests/Apis/Context/SiteContext.cs
index 976b08b2474..4c32f7cb0c9 100644
--- a/test/OrchardCore.Tests/Apis/Context/SiteContext.cs
+++ b/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,
diff --git a/test/OrchardCore.Tests/Data/JsonDynamicTests.cs b/test/OrchardCore.Tests/Data/JsonDynamicTests.cs
index b15852856a1..d5d3fc5c83c 100644
--- a/test/OrchardCore.Tests/Data/JsonDynamicTests.cs
+++ b/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;
diff --git a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs b/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs
index a2c12a9309c..55027b89827 100644
--- a/test/OrchardCore.Tests/Modules/OrchardCore.OpenId/OpenIdServerDeploymentSourceTests.cs
+++ b/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;
diff --git a/test/OrchardCore.Tests/OrchardCore.Tests.csproj b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
index 4e6ec67115d..1d3a9af1b4a 100644
--- a/test/OrchardCore.Tests/OrchardCore.Tests.csproj
+++ b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
@@ -71,6 +71,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="System.Linq.Async" />
     <PackageReference Include="Moq" />
+    <PackageReference Include="Ulid" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.analyzers" />
     <PackageReference Include="xunit.runner.visualstudio" />
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
index a9bb72444fe..7d6d1a9a8eb 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/AccountControllerTests.cs
@@ -429,7 +429,7 @@ await context.UsingTenantScopeAsync(async scope =>
                 var recipe = recipeCollections.SelectMany(recipeCollection => recipeCollection)
                     .FirstOrDefault(recipe => recipe.Name == "UserSettingsTest");
 
-                var executionId = Guid.NewGuid().ToString("n");
+                var executionId = Ulid.NewUlid().ToGuid().ToString("n");
 
                 await recipeExecutor.ExecuteAsync(
                     executionId,
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
index 08e917dda6d..5b180010a4f 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/OrchardCore.Users.Core/DefaultUserClaimsPrincipalProviderFactoryTests.cs
@@ -13,7 +13,7 @@ public async Task EnsurePrincipalHasExpectedClaims(bool emailVerified)
     {
         //Arrange
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
diff --git a/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs b/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
index 986f83074ca..ae4a32e4635 100644
--- a/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
+++ b/test/OrchardCore.Tests/OrchardCore.Users/UserValidatorTests.cs
@@ -10,7 +10,7 @@ public async Task CanValidateUser()
     {
         // Arrange
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
@@ -29,7 +29,7 @@ public async Task ShouldRequireEmail()
         // Arrange
         var describer = new IdentityErrorDescriber();
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
@@ -49,7 +49,7 @@ public async Task ShouldRequireValidEmail()
         // Arrange
         var describer = new IdentityErrorDescriber();
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "foo" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
@@ -69,14 +69,14 @@ public async Task ShouldRequireUniqueEmail()
         // Arrange
         var describer = new IdentityErrorDescriber();
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        var existingUser = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
         userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
         userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
         userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
         userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
         userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
 
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Bar", Email = "foo@foo.com" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Bar", Email = "foo@foo.com" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
@@ -96,7 +96,7 @@ public async Task ShouldRequireUserNameIsNotAnEmailAddress()
         // Arrange
         var describer = new IdentityErrorDescriber();
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "foo@foo.com", Email = "foo" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "foo@foo.com", Email = "foo" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
@@ -116,14 +116,14 @@ public async Task ShouldRequireUniqueUserName()
         // Arrange
         var describer = new IdentityErrorDescriber();
         var userManager = UsersMockHelper.MockUserManager<IUser>();
-        var existingUser = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "bar@bar.com" };
+        var existingUser = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "bar@bar.com" };
         userManager.Setup(m => m.GetUserIdAsync(existingUser)).ReturnsAsync(existingUser.UserId);
         userManager.Setup(m => m.GetUserNameAsync(existingUser)).ReturnsAsync(existingUser.UserName);
         userManager.Setup(m => m.GetEmailAsync(existingUser)).ReturnsAsync(existingUser.Email);
         userManager.Setup(m => m.FindByEmailAsync(existingUser.Email)).ReturnsAsync(existingUser);
         userManager.Setup(m => m.FindByNameAsync(existingUser.UserName)).ReturnsAsync(existingUser);
 
-        var user = new User { UserId = Guid.NewGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
+        var user = new User { UserId = Ulid.NewUlid().ToGuid().ToString("n"), UserName = "Foo", Email = "foo@foo.com" };
         userManager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.UserId);
         userManager.Setup(m => m.GetUserNameAsync(user)).ReturnsAsync(user.UserName);
         userManager.Setup(m => m.GetEmailAsync(user)).ReturnsAsync(user.Email);
diff --git a/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs b/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
index 4c658bcd6af..6d245180101 100644
--- a/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
+++ b/test/OrchardCore.Tests/Recipes/RecipeExecutorTests.cs
@@ -45,7 +45,7 @@ public async Task ShouldTrimValidScriptExpression(string recipeName, string expe
                 localizerMock.Object);
 
             // Act
-            var executionId = Guid.NewGuid().ToString("n");
+            var executionId = Ulid.NewUlid().ToGuid().ToString("n");
             var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo(recipeName) };
             await recipeExecutor.ExecuteAsync(executionId, recipeDescriptor, new Dictionary<string, object>(), CancellationToken.None);
 
@@ -65,7 +65,7 @@ await context.UsingTenantScopeAsync(async scope =>
         {
             var recipeExecutor = scope.ServiceProvider.GetRequiredService<IRecipeExecutor>();
             // Act
-            var executionId = Guid.NewGuid().ToString("n");
+            var executionId = Ulid.NewUlid().ToGuid().ToString("n");
             var recipeDescriptor = new RecipeDescriptor { RecipeFileInfo = GetRecipeFileInfo("recipe6") };
 
             var exception = await Assert.ThrowsAsync<RecipeExecutionException>(async () =>