-
Notifications
You must be signed in to change notification settings - Fork 756
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merging for release 9.4.4
- Loading branch information
Showing
7 changed files
with
90 additions
and
62 deletions.
There are no files selected for viewing
21 changes: 0 additions & 21 deletions
21
DNN Platform/DotNetNuke.Web.Mvc/DnnMvcControllerFactory.cs
This file was deleted.
Oops, something went wrong.
71 changes: 71 additions & 0 deletions
71
DNN Platform/DotNetNuke.Web.Mvc/DnnMvcDependencyResolver.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Web.Mvc; | ||
|
|
||
| namespace DotNetNuke.Web.Mvc | ||
| { | ||
| /// <summary> | ||
| /// The <see cref="IDependencyResolver"/> implementation used in the | ||
| /// MVC Modules of DNN. | ||
| /// </summary> | ||
| internal class DnnMvcDependencyResolver : IDependencyResolver | ||
| { | ||
| private readonly IServiceProvider _serviceProvider; | ||
| private readonly IDependencyResolver _resolver; | ||
|
|
||
| /// <summary> | ||
| /// Instantiate a new instance of the <see cref="DnnDependencyResolver"/>. | ||
| /// </summary> | ||
| /// <param name="serviceProvider"> | ||
| /// The <see cref="IServiceProvider"/> to be used in the <see cref="DnnDependencyResolver"/> | ||
| /// </param> | ||
| public DnnMvcDependencyResolver(IServiceProvider serviceProvider, IDependencyResolver resolver) | ||
| { | ||
| _serviceProvider = serviceProvider; | ||
| _resolver = resolver; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns the specified service from the scope | ||
| /// </summary> | ||
| /// <param name="serviceType"> | ||
| /// The service to be retrieved | ||
| /// </param> | ||
| /// <returns> | ||
| /// The retrieved service | ||
| /// </returns> | ||
| public object GetService(Type serviceType) | ||
| { | ||
| try | ||
| { | ||
| return _serviceProvider.GetService(serviceType); | ||
| } | ||
| catch | ||
| { | ||
| return _resolver.GetService(serviceType); | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns the specified services from the scope | ||
| /// </summary> | ||
| /// <param name="serviceType"> | ||
| /// The service to be retrieved | ||
| /// </param> | ||
| /// <returns> | ||
| /// The retrieved service | ||
| /// </returns> | ||
| public IEnumerable<object> GetServices(Type serviceType) | ||
| { | ||
| try | ||
| { | ||
| return _serviceProvider.GetServices(serviceType); | ||
| } | ||
| catch | ||
| { | ||
| return _resolver.GetServices(serviceType); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
DNN Platform/DotNetNuke.Web.Mvc/Extensions/StartupExtensions.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.04.04.SqlDataProvider
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /************************************************************/ | ||
| /***** SqlDataProvider *****/ | ||
| /***** *****/ | ||
| /***** *****/ | ||
| /***** Note: To manually execute this script you must *****/ | ||
| /***** perform a search and replace operation *****/ | ||
| /***** for {databaseOwner} and {objectQualifier} *****/ | ||
| /***** *****/ | ||
| /************************************************************/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters