Merge branch 'data-provided-property' of https://github.com/valadas/Dnn.Platform into data-provided-property

Author: valadas

DNN Platform/DotNetNuke.Web.Client.ResourceManager/ClientResourceController.cs

@@ -241,7 +241,12 @@ public string RenderDependencies(ResourceType resourceType, string provider, str
 
                     var ext = Path.GetExtension(resource.ResolvedPath);
                     var rtlResolvedPath = Path.ChangeExtension(resource.ResolvedPath, ".rtl" + ext);
-                    if (!File.Exists(this.appStatus.ApplicationMapPath + rtlResolvedPath))
+                    var cleanRtlResolvedPath = rtlResolvedPath.TrimStart('~').Replace("/", "\\");
+                    var physicalPath = Path.Combine(
+                        this.appStatus.ApplicationMapPath,
+                        cleanRtlResolvedPath.TrimStart('\\'));
+
+                    if (!File.Exists(physicalPath))
                     {
                         return resource;
                     }

DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs

@@ -52,11 +52,8 @@ static DotNetNukeHttpApplication()
         {
             var dependencyProvider = new LazyServiceProvider();
             Globals.DependencyProvider = dependencyProvider;
-            dependencyProvider.SetProvider(DependencyInjectionInitialize.BuildServiceProvider());
-            ServiceRequestScopeModule.SetServiceProvider(Globals.DependencyProvider);
-            HttpRuntime.WebObjectActivator = new WebFormsServiceProvider();
 
-            ComponentFactory.Container = new ContainerWithServiceProviderFallback(new SimpleContainer(), Globals.DependencyProvider);
+            ComponentFactory.Container = new ContainerWithServiceProviderFallback(new SimpleContainer(Globals.DependencyProvider), Globals.DependencyProvider);
 
             ComponentFactory.InstallComponents(new ProviderInstaller("databaseConnection", typeof(DatabaseConnectionProvider), typeof(SqlDatabaseConnectionProvider)));
             ComponentFactory.InstallComponents(new ProviderInstaller("data", typeof(DataProvider), typeof(SqlDataProvider)));
@@ -85,6 +82,10 @@ static DotNetNukeHttpApplication()
 #pragma warning restore CS0618 // Type or member is obsolete
             ComponentFactory.InstallComponents(new ProviderInstaller("tokens", typeof(TokenProvider)));
             ComponentFactory.InstallComponents(new ProviderInstaller("mail", typeof(MailProvider)));
+
+            dependencyProvider.SetProvider(DependencyInjectionInitialize.BuildServiceProvider());
+            ServiceRequestScopeModule.SetServiceProvider(Globals.DependencyProvider);
+            HttpRuntime.WebObjectActivator = new WebFormsServiceProvider();
         }
 
         private static void RegisterIfNotAlreadyRegistered<TConcrete>()

DNN Platform/DotNetNuke.Web/Common/LazyServiceProvider.cs

@@ -18,12 +18,7 @@ public class LazyServiceProvider : IServiceProvider, INotifyPropertyChanged
         /// <inheritdoc />
         public object GetService(Type serviceType)
         {
-            if (this.serviceProvider is null)
-            {
-                throw new InvalidOperationException("Cannot resolve services until the service provider is built.");
-            }
-
-            return this.serviceProvider.GetService(serviceType);
+            return this.serviceProvider?.GetService(serviceType);
         }
 
         /// <summary>Sets the service provider.</summary>

DNN Platform/Library/ComponentModel/ComponentFactory.cs

@@ -7,8 +7,12 @@ namespace DotNetNuke.ComponentModel
     using System.Collections;
     using System.Collections.Generic;
 
+    using DotNetNuke.Instrumentation;
+
     public static class ComponentFactory
     {
+        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ComponentFactory));
+
         public static IContainer Container { get; set; }
 
         public static void InstallComponents(params IComponentInstaller[] installers)
@@ -200,6 +204,7 @@ private static void VerifyContainer()
         {
             if (Container == null)
             {
+                Logger.Warn("Container was null, instantiating SimpleContainer");
                 Container = new SimpleContainer();
             }
         }

DNN Platform/Library/ComponentModel/ContainerWithServiceProviderFallback.cs

@@ -6,11 +6,14 @@ namespace DotNetNuke.ComponentModel;
 using System;
 using System.Collections;
 
+using DotNetNuke.Instrumentation;
+
 using Microsoft.Extensions.DependencyInjection;
 
 /// <summary>A container which gets components from an <see cref="IServiceProvider"/> for components not registered.</summary>
 public class ContainerWithServiceProviderFallback : IContainer
 {
+    private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ContainerWithServiceProviderFallback));
     private readonly IContainer container;
     private readonly IServiceProvider serviceProvider;
 
@@ -115,7 +118,18 @@ public object GetComponent(string name)
 
     /// <inheritdoc />
     public TContract GetComponent<TContract>()
-        => this.container.GetComponent<TContract>() ?? this.serviceProvider.GetService<TContract>();
+    {
+        Logger.Trace($"Getting component for {typeof(TContract).FullName}");
+        var service = this.container.GetComponent<TContract>();
+        if (service is not null)
+        {
+            Logger.Trace($"Got component for {typeof(TContract).FullName} from container");
+            return service;
+        }
+
+        Logger.Trace($"Getting component for {typeof(TContract).FullName} from service provider");
+        return this.serviceProvider.GetService<TContract>();
+    }
 
     /// <inheritdoc />
     public TContract GetComponent<TContract>(string name)

DNN Platform/Library/ComponentModel/IComponentBuilder.cs

@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information
 
-namespace DotNetNuke.ComponentModel
-{
-    public interface IComponentBuilder
-    {
-        string Name { get; }
-
-        object BuildComponent();
-    }
-}
+namespace DotNetNuke.ComponentModel
+{
+    public interface IComponentBuilder
+    {
+        string Name { get; }
+
+        object BuildComponent();
+    }
+}

DNN Platform/Library/ComponentModel/SimpleContainer.cs

@@ -9,40 +9,51 @@ namespace DotNetNuke.ComponentModel
     using System.Diagnostics.CodeAnalysis;
 
     using DotNetNuke.Collections.Internal;
+    using DotNetNuke.Common;
 
     public class SimpleContainer : AbstractContainer, IDisposable
     {
         private readonly string name;
+        private readonly IServiceProvider serviceProvider;
         private readonly ComponentBuilderCollection componentBuilders = new ComponentBuilderCollection();
-
         private readonly SharedDictionary<string, IDictionary> componentDependencies = new SharedDictionary<string, IDictionary>();
-
         private readonly ComponentTypeCollection componentTypes = new ComponentTypeCollection();
-
         private readonly SharedDictionary<Type, string> registeredComponents = new SharedDictionary<Type, string>();
 
         /// <summary>Initializes a new instance of the <see cref="SimpleContainer"/> class.</summary>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServiceProvider. Scheduled removal in v12.0.0.")]
         public SimpleContainer()
-            : this($"Container_{Guid.NewGuid()}")
+            : this(Globals.DependencyProvider)
+        {
+        }
+
+        /// <summary>Initializes a new instance of the <see cref="SimpleContainer"/> class.</summary>
+        /// <param name="serviceProvider">The DI container scope.</param>
+        public SimpleContainer(IServiceProvider serviceProvider)
+            : this($"Container_{Guid.NewGuid()}", serviceProvider)
         {
         }
 
         /// <summary>Initializes a new instance of the <see cref="SimpleContainer"/> class.</summary>
         /// <param name="name">The container name.</param>
+        [Obsolete("Deprecated in DotNetNuke 10.2.2. Please use overload with IServiceProvider. Scheduled removal in v12.0.0.")]
         public SimpleContainer(string name)
+            : this(name, Globals.DependencyProvider)
         {
-            this.name = name;
         }
 
-        /// <inheritdoc />
-        public override string Name
+        /// <summary>Initializes a new instance of the <see cref="SimpleContainer"/> class.</summary>
+        /// <param name="name">The container name.</param>
+        /// <param name="serviceProvider">The DI container scope.</param>
+        public SimpleContainer(string name, IServiceProvider serviceProvider)
         {
-            get
-            {
-                return this.name;
-            }
+            this.name = name;
+            this.serviceProvider = serviceProvider;
         }
 
+        /// <inheritdoc />
+        public override string Name => this.name;
+
         /// <inheritdoc />
         [SuppressMessage("Microsoft.Naming", "CA1725:ParameterNamesShouldMatchBaseDeclaration", Justification = "Breaking change")]
         public override void RegisterComponent(string name, Type type)
@@ -144,10 +155,10 @@ public override void RegisterComponent(string name, Type contractType, Type type
             switch (lifestyle)
             {
                 case ComponentLifeStyleType.Transient:
-                    builder = new TransientComponentBuilder(name, type);
+                    builder = new TransientComponentBuilder(this.serviceProvider, name, type);
                     break;
                 case ComponentLifeStyleType.Singleton:
-                    builder = new SingletonComponentBuilder(name, type);
+                    builder = new SingletonComponentBuilder(this.serviceProvider, name, type);
                     break;
             }
 

DNN Platform/Library/ComponentModel/SingletonComponentBuilder.cs

@@ -9,15 +9,18 @@ namespace DotNetNuke.ComponentModel
 
     internal class SingletonComponentBuilder : IComponentBuilder
     {
+        private readonly IServiceProvider serviceProvider;
         private readonly Type type;
         private object instance;
 
         /// <summary>Initializes a new instance of the <see cref="SingletonComponentBuilder"/> class.</summary>
+        /// <param name="serviceProvider">The DI container scope.</param>
         /// <param name="name">The name of the component.</param>
         /// <param name="type">The type of the component.</param>
-        public SingletonComponentBuilder(string name, Type type)
+        public SingletonComponentBuilder(IServiceProvider serviceProvider, string name, Type type)
         {
             this.Name = name;
+            this.serviceProvider = serviceProvider;
             this.type = type;
         }
 
@@ -27,7 +30,7 @@ public SingletonComponentBuilder(string name, Type type)
         /// <inheritdoc />
         public object BuildComponent()
         {
-            return this.instance ??= Reflection.CreateObject(this.type);
+            return this.instance ??= Reflection.CreateObject(this.serviceProvider, this.type);
         }
     }
 }

DNN Platform/Library/ComponentModel/TransientComponentBuilder.cs

@@ -5,19 +5,21 @@ namespace DotNetNuke.ComponentModel
 {
     using System;
 
-    using DotNetNuke.Common;
     using DotNetNuke.Framework;
 
     internal class TransientComponentBuilder : IComponentBuilder
     {
+        private readonly IServiceProvider serviceProvider;
         private readonly Type type;
 
         /// <summary>Initializes a new instance of the <see cref="TransientComponentBuilder"/> class.</summary>
+        /// <param name="serviceProvider">The DI container scope.</param>
         /// <param name="name">The name of the component.</param>
         /// <param name="type">The type of the component.</param>
-        public TransientComponentBuilder(string name, Type type)
+        public TransientComponentBuilder(IServiceProvider serviceProvider, string name, Type type)
         {
             this.Name = name;
+            this.serviceProvider = serviceProvider;
             this.type = type;
         }
 
@@ -27,7 +29,7 @@ public TransientComponentBuilder(string name, Type type)
         /// <inheritdoc />
         public object BuildComponent()
         {
-            return Reflection.CreateObject(this.type);
+            return Reflection.CreateObject(this.serviceProvider, this.type);
         }
     }
 }

DNN Platform/Library/Startup.cs

@@ -158,7 +158,7 @@ public void ConfigureServices(IServiceCollection services)
                 var dataProvider = serviceProvider.GetRequiredService<DataProvider>();
                 var defaultConnectionStringName = dataProvider.Settings["connectionStringName"];
 
-                return new PetaPocoDataContext(defaultConnectionStringName, DataProvider.Instance().ObjectQualifier);
+                return new PetaPocoDataContext(defaultConnectionStringName, dataProvider.ObjectQualifier);
             });
 
             services.AddTransient<ModuleInjectionManager>();