Merge branch 'dev' into issue/OSOE-689

Lombiq · Nov 8, 2023 · 75b0491 · 75b0491
2 parents fadc1ee + 4945f5e
commit 75b0491
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,13 +13,15 @@ jobs:
     name: Build and Test - root solution (larger runners)
     uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
     with:
-      machine-types: "['gitrunners-ubuntu-2204-x64-4vcpu']"
+      machine-types: "['buildjet-4vcpu-ubuntu-2204']"
       timeout-minutes: 20
       set-up-sql-server: "true"
       set-up-azurite: "true"
       ui-test-parallelism: 0
       build-create-binary-log: "true"
       blame-hang-timeout: "5m"
+      build-enable-nuget-caching: "true"
+      build-enable-npm-caching: "true"
 
   build-and-test-standard-runners:
     # Since dev builds are not awaited by anyone, they can run on the slower free runners.

diff --git a/src/Modules/Lombiq.HelpfulExtensions b/src/Modules/Lombiq.HelpfulExtensions
diff --git a/src/Modules/Lombiq.Hosting.Tenants b/src/Modules/Lombiq.Hosting.Tenants
diff --git a/test/Lombiq.UITestingToolbox b/test/Lombiq.UITestingToolbox
diff --git a/tools/Lombiq.Analyzers.PowerShell b/tools/Lombiq.Analyzers.PowerShell
+22 −0		Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/IOrchardUserConverter.cs
+22 −11		Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/OrchardExportToRecipeConverter.cs
+49 −0		Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Services/UserOrchardContentConverter.cs
+1 −0		Lombiq.HelpfulExtensions/Extensions/OrchardRecipeMigration/Startup.cs
+5 −1		Lombiq.HelpfulExtensions/Manifest.cs
+4 −2		Lombiq.HelpfulExtensions/Views/OrchardRecipeMigrationAdmin/Index.cshtml
+11 −1		Readme.md
+1 −1		Lombiq.Hosting.Tenants.Admin.Login/Manifest.cs
+2 −2		Lombiq.Hosting.Tenants.EmailQuotaManagement/Manifest.cs
+2 −2		Lombiq.Hosting.Tenants.EnvironmentRobots/Manifest.cs
+2 −2		Lombiq.Hosting.Tenants.FeaturesGuard/Manifest.cs
+2 −2		Lombiq.Hosting.Tenants.IdleTenantManagement/Manifest.cs
+5 −2		....Hosting.Tenants.Maintenance/Maintenance/UpdateShellRequestUrl/UpdateShellRequestUrlsMaintenanceProvider.cs
+5 −5		Lombiq.Hosting.Tenants.Maintenance/Manifest.cs
+3 −3		Lombiq.Hosting.Tenants.Management/Manifest.cs
+1 −1		Lombiq.Hosting.Tenants.MediaStorageManagement/Manifest.cs