Skip to content

Commit

Permalink
Merge pull request #4069 from dnnsoftware/release/9.7.1
Browse files Browse the repository at this point in the history
Release/9.7.1
  • Loading branch information
valadas authored Sep 9, 2020
2 parents 7ce8429 + 9ed0f16 commit 3362109
Show file tree
Hide file tree
Showing 139 changed files with 18,668 additions and 17,251 deletions.
4 changes: 3 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
# top-most EditorConfig file
root = true

# Standardize on CR/LF (Windows) line endings
# Don't use tabs for indentation.
[*]
end_of_line = crlf
indent_style = space
# (Please don't specify an indent_size here; that has too many unintended consequences.)

Expand Down Expand Up @@ -182,4 +184,4 @@ csharp_space_between_parentheses = false
# Blocks are allowed
csharp_prefer_braces = true:silent
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_statements = true
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ Provide any additional context that may be helpful in understanding and/or resol
Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
-->
* [ ] 10.00.00 alpha build
* [ ] 09.07.00 release candidate
* [ ] 09.06.02 latest supported release
* [ ] 09.07.01 release candidate
* [ ] 09.07.00 latest supported release

## Affected browser
<!--
Expand Down
4 changes: 4 additions & 0 deletions .github/mergeable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ mergeable:
begins_with:
match: 'Type:' # or array of strings
message: 'A `Type:` label must be assigned to this pull request'
must_exclude:
regex: 'On Hold'
regex_flag: 'none' # Optional. Specify the flag for Regex. default is 'i', to disable default use 'none'
message: 'This PR is `On Hold`'
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.07.00" >
<package name="DotNetNuke_Symbols" type="Library" version="09.07.01" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.07.00">
<package name="DotNetNuke.Console" type="Module" version="09.07.01">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Module Creator" type="Module" version="09.07.00">
<package name="DotNetNuke.Module Creator" type="Module" version="09.07.01">
<friendlyName>Module Creator</friendlyName>
<description>Development of modules.</description>
<iconFile>~/Icons/Sigma/ModuleCreator_32x32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.07.00">
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.07.01">
<friendlyName>DotNetNuke Telerik Web Components</friendlyName>
<description>Provides Telerik Components for DotNetNuke.</description>
<dependencies/>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Connectors/Azure/AzureConnector.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.07.00">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.07.01">
<friendlyName>Dnn Azure Connector</friendlyName>
<description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
<iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.07.00">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.07.01">
<friendlyName>Google Analytics Connector</friendlyName>
<description>Configure your sites Google Analytics settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNJWT" type="Provider" version="09.07.00">
<package name="DNNJWT" type="Provider" version="09.07.01">
<friendlyName>DNN JWT Auth Handler</friendlyName>
<description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
<dependencies/>
Expand Down
113 changes: 113 additions & 0 deletions DNN Platform/DotNetNuke.Abstractions/Application/IApplicationInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
// Licensed to the .NET Foundation under one or more agreements.
// 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.Abstractions.Application
{
using System;

/// <summary>
/// The Application class contains properties that describe the DotNetNuke Application.
/// </summary>
public interface IApplicationInfo
{
/// <summary>
/// Gets the company to which the DotNetNuke application is related.
/// </summary>
/// <value>Fixed result: DotNetNuke Corporation.</value>
string Company { get; }

/// <summary>
/// Gets the version of the currently installed DotNetNuke framework/application
/// Can be prior to Version, if the application is pending to be upgraded.
/// </summary>
/// <value>The version as retreieved from the database version table.</value>
Version CurrentVersion { get; }

/// <summary>
/// Gets the description of the application.
/// </summary>
/// <value>Fixed result: DNN Platform.</value>
string Description { get; }

/// <summary>
/// Gets the help URL related to the DotNetNuke application.
/// </summary>
/// <value>Fixed result: https://dnndocs.com/. </value>
string HelpUrl { get; }

/// <summary>
/// Gets the legal copyright.
/// </summary>
/// <value>Dynamic: DNN Platform is copyright 2002-todays year by .NET Foundation".</value>
string LegalCopyright { get; }

/// <summary>
/// Gets the name of the application.
/// </summary>
/// <value>Fixed result: DNNCORP.CE.</value>
string Name { get; }

/// <summary>
/// Gets the SKU (Stock Keeping Unit).
/// </summary>
/// <value>Fixed result: DNN.</value>
string SKU { get; }

/// <summary>
/// Gets the status of the DotnetNuke application.
/// </summary>
/// <remarks>
/// If the value is not be Stable, you will see the exactly status and version in page's title if allow display beta message in host setting.
/// </remarks>
/// <value>
/// The value can be: None, Alpha, Beta, RC, Stable.
/// </value>
ReleaseMode Status { get; }

/// <summary>
/// Gets the title of the application.
/// </summary>
/// <value>Fixed value: DotNetNuke.</value>
string Title { get; }

/// <summary>
/// Gets the trademark.
/// </summary>
/// <value>Fixed value: DotNetNuke,DNN.</value>
string Trademark { get; }

/// <summary>
/// Gets the type of the application.
/// </summary>
/// <value>Fixed value: Framework.</value>
string Type { get; }

/// <summary>
/// Gets the upgrade URL.
/// </summary>
/// <value>Fixed value: https://dnnplatform.io. </value>
string UpgradeUrl { get; }

/// <summary>
/// Gets the URL of the application.
/// </summary>
/// <value>Fixed value: https://dnncommunity.org.</value>
string Url { get; }

/// <summary>
/// Gets the version of the DotNetNuke framework/application.
/// </summary>
/// <value>The version as retreieved from the Executing assembly.</value>
Version Version { get; }

/// <summary>
/// Determine whether a product specific change is to be applied.
/// </summary>
/// <param name = "productNames">list of product names.</param>
/// <returns>true if product is within list of names.</returns>
/// <remarks>
/// </remarks>
bool ApplyToProduct(string productNames);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
// Licensed to the .NET Foundation under one or more agreements.
// 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.Abstractions.Application
{
using System;

/// <summary>
/// The Application Status Info, includes information about installation
/// and database version.
/// </summary>
public interface IApplicationStatusInfo
{
/// <summary>
/// Gets the status of application.
/// </summary>
UpgradeStatus Status { get; }

/// <summary>
/// Gets the application map path.
/// </summary>
/// <value>
/// The application map path.
/// </value>
string ApplicationMapPath { get; }

/// <summary>
/// Gets the database version.
/// </summary>
Version DatabaseVersion { get; }

/// <summary>
/// IsInstalled looks at various file artifacts to determine if DotNetNuke has already been installed.
/// </summary>
/// <returns>true if installed else false.</returns>
/// <remarks>
/// If DotNetNuke has been installed, then we should treat database connection errors as real errors.
/// If DotNetNuke has not been installed, then we should expect to have database connection problems
/// since the connection string may not have been configured yet, which can occur during the installation
/// wizard.
/// </remarks>
bool IsInstalled();

/// <summary>
/// Sets the status.
/// </summary>
/// <param name="status">The status.</param>
void SetStatus(UpgradeStatus status);

/// <summary>
/// Updates the database version.
/// </summary>
/// <param name="version">The version.</param>
void UpdateDatabaseVersion(Version version);

/// <summary>
/// Updates the database version.
/// </summary>
/// <param name="version">The version.</param>
/// <param name="increment">The increment.</param>
void UpdateDatabaseVersionIncrement(Version version, int increment);

/// <summary>
/// Needs documentation.
/// </summary>
/// <param name="version">The version.</param>
/// <returns>true is success else false.</returns>
bool IncrementalVersionExists(Version version);

/// <summary>
/// Get the last application iteration.
/// </summary>
/// <param name="version">The version.</param>
/// <returns>The result.</returns>
int GetLastAppliedIteration(Version version);
}
}
17 changes: 17 additions & 0 deletions DNN Platform/DotNetNuke.Abstractions/Application/IDnnContext.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Licensed to the .NET Foundation under one or more agreements.
// 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.Abstractions.Application
{
/// <summary>
/// Defines the context for the environment of the DotNetNuke application.
/// </summary>
public interface IDnnContext
{
/// <summary>
/// Gets get the application.
/// </summary>
IApplicationInfo Application { get; }
}
}
Loading

0 comments on commit 3362109

Please sign in to comment.