Merge remote-tracking branch 'upstream/master' into 2021-04-22_gridtiletest

2021-05-03 00:47:01 +10:00
parent 64479b54a3 31c5b18fe2
commit 857356958a
411 changed files with 5348 additions and 4154 deletions
--- a/Content.IntegrationTests/ContentIntegrationTest.cs
+++ b/Content.IntegrationTests/ContentIntegrationTest.cs
@@ -28,6 +28,8 @@ namespace Content.IntegrationTests
                FailureLogLevel = LogLevel.Warning
            };

+            options.ContentStart = true;
+
            options.ContentAssemblies = new[]
            {
                typeof(Shared.EntryPoint).Assembly,
@@ -69,6 +71,8 @@ namespace Content.IntegrationTests
                FailureLogLevel = LogLevel.Warning
            };

+            options.ContentStart = true;
+
            options.ContentAssemblies = new[]
            {
                typeof(Shared.EntryPoint).Assembly,