Merge remote-tracking branch 'origin/release/13.0' into v13/dev

tests/Umbraco.Tests.Integration/CompatibilitySuppressions.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
-<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Suppression>
-    <DiagnosticId>PKV006</DiagnosticId>
-    <Target>net7.0</Target>
-  </Suppression>
-</Suppressions>

tests/Umbraco.Tests.Integration/Umbraco.Persistence.EFCore/DbContext/CustomDbContextTests.cs

@@ -0,0 +1,101 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Testing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Persistence.EFCore.DbContext;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class CustomDbContextUmbracoProviderTests : UmbracoIntegrationTest
+{
+    [Test]
+    public void Can_Register_Custom_DbContext_And_Resolve()
+    {
+        var dbContext = Services.GetRequiredService<CustomDbContext>();
+
+        Assert.IsNotNull(dbContext);
+        Assert.IsNotEmpty(dbContext.Database.GetConnectionString());
+    }
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
+    {
+        builder.Services.AddUmbracoDbContext<CustomDbContext>((serviceProvider, options) =>
+        {
+            options.UseUmbracoDatabaseProvider(serviceProvider);
+        });
+    }
+
+    internal class CustomDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public CustomDbContext(DbContextOptions<CustomDbContext> options)
+            : base(options)
+        {
+        }
+    }
+}
+
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class CustomDbContextCustomSqliteProviderTests : UmbracoIntegrationTest
+{
+    [Test]
+    public void Can_Register_Custom_DbContext_And_Resolve()
+    {
+        var dbContext = Services.GetRequiredService<CustomDbContext>();
+
+        Assert.IsNotNull(dbContext);
+        Assert.IsNotEmpty(dbContext.Database.GetConnectionString());
+    }
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
+    {
+        builder.Services.AddUmbracoDbContext<CustomDbContext>((serviceProvider, options) =>
+        {
+            options.UseSqlite("Data Source=:memory:;Version=3;New=True;");
+        });
+    }
+
+    internal class CustomDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public CustomDbContext(DbContextOptions<CustomDbContext> options)
+            : base(options)
+        {
+        }
+    }
+}
+
+[Obsolete]
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class CustomDbContextLegacyExtensionProviderTests : UmbracoIntegrationTest
+{
+    [Test]
+    public void Can_Register_Custom_DbContext_And_Resolve()
+    {
+        var dbContext = Services.GetRequiredService<CustomDbContext>();
+
+        Assert.IsNotNull(dbContext);
+        Assert.IsNotEmpty(dbContext.Database.GetConnectionString());
+    }
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
+    {
+        builder.Services.AddUmbracoEFCoreContext<CustomDbContext>("Data Source=:memory:;Version=3;New=True;", "Microsoft.Data.Sqlite", (options, connectionString, providerName) =>
+        {
+            options.UseSqlite(connectionString);
+        });
+    }
+
+    internal class CustomDbContext : Microsoft.EntityFrameworkCore.DbContext
+    {
+        public CustomDbContext(DbContextOptions<CustomDbContext> options)
+            : base(options)
+        {
+        }
+    }
+}
+

tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj

@@ -6,8 +6,7 @@
     <Description>Contains helper classes for integration tests with Umbraco CMS, including all internal integration tests.</Description>
     <RootNamespace>Umbraco.Cms.Tests.Integration</RootNamespace>
     <IsPackable>true</IsPackable>
-    <EnablePackageValidation>true</EnablePackageValidation>
-    <GenerateCompatibilitySuppressionFile>true</GenerateCompatibilitySuppressionFile>
+    <EnablePackageValidation>$(BaseEnablePackageValidation)</EnablePackageValidation>
   </PropertyGroup>
 
   <ItemGroup>