Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/9.7.0 #4009

Merged
merged 79 commits into from
Aug 25, 2020
Merged

Release/9.7.0 #4009

merged 79 commits into from
Aug 25, 2020

Conversation

valadas
Copy link
Contributor

@valadas valadas commented Aug 25, 2020

Merging into master to release 9.7.0

donker and others added 30 commits May 28, 2020 09:49
Also adjusted some whitespace and moved a couple of classes into
separate files
SA12xx fixes - rearrange members
Co-authored-by: Derek Sjak-Shie <derek.sjak-shie@dotcontrol.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Co-authored-by: Brian Dukes <bdukes@engagesoftware.com>
Merge latest changes from 9.6.2 into develop
# Conflicts:
#	DNN Platform/DotNetNuke.Abstractions/INavigationManager.cs
#	DNN Platform/DotNetNuke.Abstractions/Portals/IPortalSettings.cs
#	DNN Platform/Library/Entities/Modules/Settings/SettingsRepository.cs
#	DNN Platform/Library/Entities/Portals/PortalAliasInfo.cs
#	DNN Platform/Library/Entities/Portals/PortalSettings.cs
#	DNN Platform/Library/Entities/Users/UserInfo.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Commands/ListCommands.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/AddModule.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Commands/Module/ListModules.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/IModulesController.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/ModulesController.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/CommandRepository.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Repositories/ICommandRepository.cs
#	Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/CommandController.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/Attributes/ConsoleCommandAttribute.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/ConsoleCommandBase.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/IConsoleCommand.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/Models/ConsoleErrorResultModel.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/Models/ConsoleResultModel.cs
#	Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Prompt/Models/PagingInfo.cs
use the default TokenProvider for token replacement
cleanup
Implement a Token Provider interface
Include CSS and JS CDF methods in the Dnn helper for Razor
Updated usage in TabIndexer.cs
Used same logic for check in CoreSitemapProvider.cs
bdukes and others added 25 commits July 22, 2020 08:18
Version 5.1.3 of the Microsoft.AspNet.Mvc NuGet packages, which we've
been depending on for a while, depends on Microsoft.AspNet.WebPages and
Microsoft.AspNet.Razor in the version range >= 3.1.2 && < 3.2.0 (which
only resolves to 3.1.2).
Modify Logo skin object to handle SVGs
Retry determining Globals.Status if it was Error
Ensure DI services are disposed in WebForms
Prevented unnecessary call to getCultureList method on website change
* Resolves 9.6.2 logging issue.

Closes #3906

Apparently some files where deleted as part of #3843

This PR brings those files back and also fixes stylecop warnings. Some class names had to be changed both for clarity and to respect stylecop rule that the file name should match the class name. Because of that change, the dnn manifest was also changed so it all works with the new names.

* fixes one missed ref in manifest
* Load DNN types first in DI startup

Fixes #3335

* Simplify main DI Startup class

It doesn't need to implement IDnnStartup, it can just configure the
service provider and be done.  This also allows us to stop ignoring
other IDnnStartup instances in the DotNetNuke.Web project, were they to
be created later.

* Fix error message when calling ConfigureServices

* Move AddWebApi call to regular IDnnStartup

This ensures that it's called at the right time relative to all other DI
configuration.

* Fix ordering of IDnnStartup for real

* Add List-Services debugging command for Prompt
Abstracted AllowIndex logic into TabInfo property
Address StyleCop warnings for TabInfo and TabIndexer
Updates versions as per release candidate creation
The returned object was not scope on a page object which caused the frontend to no read the proper object in GetPageDetails return.
Reset invalidation link on email change
@valadas valadas added this to the 9.7.0 milestone Aug 25, 2020
@valadas
Copy link
Contributor Author

valadas commented Aug 25, 2020

This is a release management task and we are self-approving it for that reason.

@valadas valadas merged commit 7ce8429 into master Aug 25, 2020
@valadas valadas deleted the release/9.7.0 branch April 17, 2023 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.