Merge pull request #3660 from 2sic/develop

v20.00.02

Author: iJungleboy

Src/2sxc Multi-Target.sln.DotSettings

@@ -8,6 +8,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Backends/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Clickable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cmsid/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=crossorigin/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=decryptor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Deduplicated/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Deduplicating/@EntryIndexedValue">True</s:Boolean>

Src/Data/App_Data/system/bundles/system-settings.json

@@ -9811,7 +9811,7 @@
         },
         {
           "Id": 130593,
-          "Version": 13,
+          "Version": 14,
           "Guid": "c459f03d-bb65-4813-ac8a-0a780f72eab7",
           "Type": {
             "Id": "f5764f60-2621-4a5d-9391-100fbe664640",
@@ -9820,7 +9820,7 @@
           "Attributes": {
             "String": {
               "ApiKey": {
-                "en-us": "secure:pycbhspVSBHE662IjdEfFG8rwwCdxN9jCQaMJK6/QfLl/JxaDhAk+6q1WU4BSXw4;iv:HUyYDwdMhsuiaxZo3TG4Zg=="
+                "en-us": "secure:7nRMfvzJ0BHyTtGDFaVB4kCYLBGRkgW1oAYG1KTLXk/jme8q9Hhb4a1ZOuJVwM94;iv:5cmjUX6SDTJMCj+IkwhWNA=="
               },
               "SettingsIdentifier": {
                 "en-us": "GoogleMaps"

Src/Dnn/ToSic.Sxc.Dnn.Core/Compatibility/Data.DynamicEntity.Toolbar/OldDynamicEntityFeatures.cs

@@ -7,6 +7,7 @@
 using ToSic.Sxc.Data.Sys;
 using ToSic.Sxc.Data.Sys.CodeDataFactory;
 using ToSic.Sxc.Data.Sys.Factory;
+using ToSic.Sxc.Edit.Toolbar.Sys;
 using ToSic.Sxc.Services;
 
 // ReSharper disable once CheckNamespace
@@ -32,7 +33,7 @@ public System.Web.IHtmlString GenerateOldToolbar(ICodeDataFactory cdf, IEntity e
         if (cdf.CompatibilityLevel > CompatibilityLevels.MaxLevelForEntityDotToolbar)
             throw new("content.Toolbar is deprecated in the new RazorComponent. Use @Edit.TagToolbar(content) or @Edit.Toolbar(content) instead. See https://go.2sxc.org/EditToolbar");
 
-        var toolbar = new Edit.Toolbar.ItemToolbar(entity).ToolbarAsTag;
+        var toolbar = new ItemToolbar(entity).ToolbarAsTag;
         return new System.Web.HtmlString(toolbar);
 
     }

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Adam/DnnAdamFileSystem.cs

@@ -3,7 +3,6 @@
 using System.Data.SqlClient;
 using System.Web.Configuration;
 using ToSic.Eav.Apps.Sys;
-using ToSic.Lib.Services;
 using ToSic.Sxc.Adam;
 using ToSic.Sxc.Adam.Sys;
 using ToSic.Sxc.Adam.Sys.FileSystem;

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Cms/DnnModuleUpdater.cs

@@ -7,7 +7,6 @@
 using ToSic.Eav.Context.Sys.ZoneMapper;
 using ToSic.Eav.Data;
 using ToSic.Eav.Metadata.Sys;
-using ToSic.Lib.Services;
 using ToSic.Sxc.Apps.Sys.Work;
 using ToSic.Sxc.Blocks;
 using ToSic.Sxc.Blocks.Sys;

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Cms/DnnPagePublishing.cs

@@ -14,7 +14,7 @@
 using ToSic.Sxc.Dnn.Context;
 using ToSic.Sxc.Dnn.Run;
 
-using ServiceBase = ToSic.Lib.Services.ServiceBase;
+using ServiceBase = ToSic.Sys.Services.ServiceBase;
 
 namespace ToSic.Sxc.Dnn.Cms;
 

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Cms/DnnPagePublishing_ModuleSettings.cs

@@ -1,5 +1,4 @@
 using DotNetNuke.Entities.Modules;
-using ToSic.Lib.Services;
 
 namespace ToSic.Sxc.Dnn.Cms;
 

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeRootTT.cs

@@ -1,17 +1,20 @@
-using ToSic.Lib.Helpers;
-using ToSic.Sxc.Dnn.Run;
+using ToSic.Sxc.Dnn.Run;
 using ToSic.Sxc.Services;
+using ToSic.Sxc.Services.Sys;
 using ToSic.Sxc.Sys.ExecutionContext;
 using ExecutionContext = ToSic.Sxc.Sys.ExecutionContext.ExecutionContext;
 
 namespace ToSic.Sxc.Dnn.Code;
 
 [PrivateApi]
-internal class DnnExecutionContext<TModel, TServiceKit>(ExecutionContext.MyServices services)
+internal class DnnExecutionContext<TModel, TServiceKit>(ExecutionContext.Dependencies services)
     : ExecutionContext<TModel, TServiceKit>(services, DnnConstants.LogName), IHasDnn
     where TModel : class
     where TServiceKit : ServiceKit
 {
+
+    // TODO: WE CAN PROBABLY DROP THIS CLASS, IF WE ALWAYS USE GetService<IDnnContext>(reuse: true) INSTEAD OF DNN
+
     /// <summary>
     /// Dnn context with module, page, portal etc.
     /// </summary>

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnDynamicCodeService.cs

@@ -1,6 +1,5 @@
 using System.Web;
 using System.Web.UI;
-using ToSic.Lib.Services;
 using ToSic.Sxc.Dnn.Services;
 using ToSic.Sxc.Dnn.Web;
 using ToSic.Sxc.Services.Sys.DynamicCodeService;
@@ -22,15 +21,15 @@ internal class DnnDynamicCodeService: DynamicCodeService
         LazySvc<PageChangeSummary> pageChangeSummary,
         LazySvc<DnnPageChanges> dnnPageChanges,
         LazySvc<DnnClientResources> dnnClientResources)
-        : MyServicesBase(connect: [pageServiceShared, pageChangeSummary, dnnPageChanges, dnnClientResources])
+        : DependenciesBase(connect: [pageServiceShared, pageChangeSummary, dnnPageChanges, dnnClientResources])
     {
         public LazySvc<IPageServiceShared> PageServiceShared { get; } = pageServiceShared;
         public LazySvc<PageChangeSummary> PageChangeSummary { get; } = pageChangeSummary;
         public LazySvc<DnnPageChanges> DnnPageChanges { get; } = dnnPageChanges;
         public LazySvc<DnnClientResources> DnnClientResources { get; } = dnnClientResources;
     }
 
-    public DnnDynamicCodeService(MyServices services) : base(services, $"{DnnConstants.LogName}.DynCdS")
+    public DnnDynamicCodeService(Dependencies services) : base(services, $"{DnnConstants.LogName}.DynCdS")
     {
         _scopedServices = ScopedServiceProvider.Build<MyScopedServices>().ConnectServices(Log);
         _user = services.User;

Src/Dnn/ToSic.Sxc.Dnn.Core/Dnn/Code/DnnExecutionContext.cs

@@ -1,4 +1,5 @@
 using ToSic.Sxc.Services;
+using ToSic.Sxc.Services.Sys;
 using ExecutionContext = ToSic.Sxc.Sys.ExecutionContext.ExecutionContext;
 
 namespace ToSic.Sxc.Dnn.Code;
@@ -7,5 +8,5 @@ namespace ToSic.Sxc.Dnn.Code;
 /// The basic DnnDynamicCode without explicitly typed model / kit
 /// </summary>
 [PrivateApi]
-internal class DnnExecutionContext(ExecutionContext.MyServices services)
+internal class DnnExecutionContext(ExecutionContext.Dependencies services)
     : DnnExecutionContext<object, ServiceKit>(services);