Skip to content

Commit a178514

Browse files
bdukesbdukes
authored
Merging for release 9.4.4 (#3394)
Merging for release 9.4.4
2 parents dbeb24c + b27215c commit a178514

File tree

7 files changed

+90
-62
lines changed

7 files changed

+90
-62
lines changed

‎DNN Platform/DotNetNuke.Web.Mvc/DnnMvcControllerFactory.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎DNN Platform/DotNetNuke.Web.Mvc/DnnMvcDependencyResolver.cs

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
using Microsoft.Extensions.DependencyInjection;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Web.Mvc;
5+
6+
namespace DotNetNuke.Web.Mvc
7+
{
8+
/// <summary>
9+
/// The <see cref="IDependencyResolver"/> implementation used in the
10+
/// MVC Modules of DNN.
11+
/// </summary>
12+
internal class DnnMvcDependencyResolver : IDependencyResolver
13+
{
14+
private readonly IServiceProvider _serviceProvider;
15+
private readonly IDependencyResolver _resolver;
16+
17+
/// <summary>
18+
/// Instantiate a new instance of the <see cref="DnnDependencyResolver"/>.
19+
/// </summary>
20+
/// <param name="serviceProvider">
21+
/// The <see cref="IServiceProvider"/> to be used in the <see cref="DnnDependencyResolver"/>
22+
/// </param>
23+
public DnnMvcDependencyResolver(IServiceProvider serviceProvider, IDependencyResolver resolver)
24+
{
25+
_serviceProvider = serviceProvider;
26+
_resolver = resolver;
27+
}
28+
29+
/// <summary>
30+
/// Returns the specified service from the scope
31+
/// </summary>
32+
/// <param name="serviceType">
33+
/// The service to be retrieved
34+
/// </param>
35+
/// <returns>
36+
/// The retrieved service
37+
/// </returns>
38+
public object GetService(Type serviceType)
39+
{
40+
try
41+
{
42+
return _serviceProvider.GetService(serviceType);
43+
}
44+
catch
45+
{
46+
return _resolver.GetService(serviceType);
47+
}
48+
}
49+
50+
/// <summary>
51+
/// Returns the specified services from the scope
52+
/// </summary>
53+
/// <param name="serviceType">
54+
/// The service to be retrieved
55+
/// </param>
56+
/// <returns>
57+
/// The retrieved service
58+
/// </returns>
59+
public IEnumerable<object> GetServices(Type serviceType)
60+
{
61+
try
62+
{
63+
return _serviceProvider.GetServices(serviceType);
64+
}
65+
catch
66+
{
67+
return _resolver.GetServices(serviceType);
68+
}
69+
}
70+
}
71+
}

‎DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@
116116
<Compile Include="Common\ModuleControlControllerAdapter.cs" />
117117
<Compile Include="Common\PropertyHelper.cs" />
118118
<Compile Include="Common\TypeHelper.cs" />
119-
<Compile Include="DnnMvcControllerFactory.cs" />
120-
<Compile Include="Extensions\StartupExtensions.cs" />
119+
<Compile Include="DnnMvcDependencyResolver.cs" />
121120
<Compile Include="Framework\ActionFilters\AuthFilterContext.cs" />
122121
<Compile Include="Framework\ActionFilters\AuthorizeAttributeBase.cs" />
123122
<Compile Include="Framework\ActionFilters\DnnAuthorizeAttribute.cs" />

‎DNN Platform/DotNetNuke.Web.Mvc/Extensions/StartupExtensions.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎DNN Platform/DotNetNuke.Web.Mvc/Startup.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using DotNetNuke.DependencyInjection;
2-
using DotNetNuke.Web.Mvc.Extensions;
1+
using DotNetNuke.Common;
2+
using DotNetNuke.DependencyInjection;
33
using Microsoft.Extensions.DependencyInjection;
44
using System.Web.Mvc;
55

@@ -9,9 +9,11 @@ public class Startup : IDnnStartup
99
{
1010
public void ConfigureServices(IServiceCollection services)
1111
{
12-
services.AddMvc();
13-
services.AddSingleton<IControllerFactory, DnnMvcControllerFactory>();
12+
services.AddSingleton(serviceProvider => ControllerBuilder.Current.GetControllerFactory());
1413
services.AddSingleton<MvcModuleControlFactory>();
14+
15+
IDependencyResolver resolver = new DnnMvcDependencyResolver(Globals.DependencyProvider, DependencyResolver.Current);
16+
DependencyResolver.SetResolver(resolver);
1517
}
1618
}
1719
}

‎DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.04.04.SqlDataProvider

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/************************************************************/
2+
/***** SqlDataProvider *****/
3+
/***** *****/
4+
/***** *****/
5+
/***** Note: To manually execute this script you must *****/
6+
/***** perform a search and replace operation *****/
7+
/***** for {databaseOwner} and {objectQualifier} *****/
8+
/***** *****/
9+
/************************************************************/

‎Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Resources/sums.resources

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<sum name="Default.aspx" version="9.2.2" type="Content" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
7777
<sum name="Default.aspx" version="9.3.0" type="Content" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
7878
<sum name="Default.aspx" version="9.3.1" type="Content" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
79+
<sum name="Default.aspx" version="9.4.0" type="Content" sum="573105c7f2a91977b8bf0c731e00207cf4a9aee50aa8ed018f8817313046c379" />
7980
<sum name="Default.aspx" version="6.2.0" type="Platform" sum="ed7da8e8e356751f2ded2eed531379ec1fee4c9a1dd4d3966a0de92fe5833ee5" />
8081
<sum name="Default.aspx.cs" version="6.2.0" type="Platform" sum="653203223cd51601e02e50107a74771a99fb5b8ccc6a9cd56aa83014428abd98" />
8182
<sum name="Default.aspx" version="6.2.1" type="Platform" sum="f90742e449f73fe6b1e164f5ab9879f0070ff227d4801ce36b7d24b348fc4667" />
@@ -158,6 +159,7 @@
158159
<sum name="Default.aspx" version="9.4.1" type="Platform" sum="573105C7F2A91977B8BF0C731E00207CF4A9AEE50AA8ED018F8817313046C379" />
159160
<sum name="Default.aspx" version="9.4.2" type="Platform" sum="573105C7F2A91977B8BF0C731E00207CF4A9AEE50AA8ED018F8817313046C379" />
160161
<sum name="Default.aspx" version="9.4.3" type="Platform" sum="573105C7F2A91977B8BF0C731E00207CF4A9AEE50AA8ED018F8817313046C379" />
162+
<sum name="Default.aspx" version="9.4.4" type="Platform" sum="573105C7F2A91977B8BF0C731E00207CF4A9AEE50AA8ED018F8817313046C379" />
161163
<sum name="Default.aspx" version="1.0.0" type="Social" sum="9536635227c3846393b448a280119dec7f3d8782b57a053ed1941383e8694ff1" />
162164
<sum name="Default.aspx.cs" version="1.0.0" type="Social" sum="d273408eb73ee09674a5f80303d903805358c9eb8f38633706fc3c793e6bbe19" />
163165
<sum name="Default.aspx" version="1.1.1" type="Social" sum="9536635227c3846393b448a280119dec7f3d8782b57a053ed1941383e8694ff1" />
@@ -197,4 +199,5 @@
197199
<sum name="Default.aspx" version="9.2.2" type="Social" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
198200
<sum name="Default.aspx" version="9.3.0" type="Social" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
199201
<sum name="Default.aspx" version="9.3.1" type="Social" sum="596e44557b4034d334dfed0bb7717d58f9b5de7d322eb26d734967b78d358b68" />
202+
<sum name="Default.aspx" version="9.4.0" type="Social" sum="573105c7f2a91977b8bf0c731e00207cf4a9aee50aa8ed018f8817313046c379" />
200203
</checksums>

0 commit comments

Comments
 (0)