Skip to content

Commit

Permalink
Merge pull request #4796 from dnnsoftware/release/9.10.1
Browse files Browse the repository at this point in the history
Merged Release/9.10.1 into master to release v9.10.1
  • Loading branch information
valadas committed Aug 24, 2021
2 parents 746498b + 9ec1a0f commit 7e293b9
Show file tree
Hide file tree
Showing 218 changed files with 26,557 additions and 24,508 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Expand Up @@ -41,7 +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.09.00 latest supported release
* [ ] 09.10.01 release candidate
* [ ] 09.10.00 latest supported release

## Affected browser
<!--
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/updateVersions.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: valadas/set-dnn-manifest-versions@v1.2.0
with:
version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }}
skipFile: './Build/Cake/unversionedManifests.txt'
skipFile: './Build/Tasks/unversionedManifests.txt'
includeSolutionInfo: true
includeIssueTemplates: true
includePackageJson: true
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Expand Up @@ -134,6 +134,13 @@ DNN [Pp]latform/Modules/ResourceManager/**/scripts/*-bundle.*
!DNN Platform/[Ww]ebsite/App_Data/FipsCompilanceAssemblies/Lucene.Net.dll

yarn-error.log
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*

/Build/bin/
/.dotnet/
Expand Down
1 change: 0 additions & 1 deletion .nuget/NuGet.Config
Expand Up @@ -10,6 +10,5 @@
</activePackageSource>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="MyGet" value="https://www.myget.org/F/dnn-software-public/api/v2" />
</packageSources>
</configuration>
631 changes: 631 additions & 0 deletions .yarn/releases/yarn-3.0.0.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
@@ -0,0 +1,2 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-3.0.0.cjs
2 changes: 1 addition & 1 deletion Build/BuildScripts/AEModule.build
Expand Up @@ -45,7 +45,7 @@
<Target Name="RunYarnWorkspace">
<Message Importance="high" Text="Running Yarn for $(WorkingDirectory)" />

<Yarn Command="install --frozen-lockfile" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="install --no-immutable" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
<Yarn Command="build" WorkingDirectory="$(WorkingDirectory)" IgnoreExitCode="false" Condition="$(WorkingDirectory.Length) > 0" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion Build/Program.cs
Expand Up @@ -23,7 +23,7 @@ public static int Main(string[] args)
.UseModule<AzurePipelinesModule>()
.InstallTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"))
.InstallTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"))
.InstallTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"))
.InstallTool(new Uri("nuget:?package=NUnit3TestAdapter&version=4.0.0"))
.InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"))
.InstallTool(new Uri("nuget:?package=Cake.Issues.MsBuild&version=0.9.1"))
.Run(args);
Expand Down
2 changes: 1 addition & 1 deletion Build/Symbols/DotNetNuke_Symbols.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke_Symbols" type="Library" version="09.09.01" >
<package name="DotNetNuke_Symbols" type="Library" version="09.10.01" >
<friendlyName>DNN Platform Symbols</friendlyName>
<description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
<owner>
Expand Down
3 changes: 1 addition & 2 deletions Build/Tasks/UnitTests.cs
@@ -1,7 +1,6 @@
// 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.Build.Tasks
{
using System;
Expand Down Expand Up @@ -37,7 +36,7 @@ public override void Run(Context context)
Logger = "trx",
Parallel = true,
EnableCodeCoverage = true,
TestAdapterPath = @"tools\NUnitTestAdapter.2.3.0\build",
TestAdapterPath = @"tools\NUnit3TestAdapter.4.0.0\build",
});
}
}
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Console" type="Module" version="09.09.01">
<package name="DotNetNuke.Console" type="Module" version="09.10.01">
<friendlyName>Console</friendlyName>
<description>Display children pages as icon links for navigation.</description>
<iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.09.01">
<package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.10.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
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.09.01">
<package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.10.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
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.09.01">
<package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.10.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
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.09.01">
<package name="DNN.Connectors.GoogleTagManager" type="Connector" isSystem="false" version="09.10.01">
<friendlyName>Google Tag Manager Connector</friendlyName>
<description>Configure your sites Google Tag Manager settings.</description>
<iconFile>~/DesktopModules/Connectors/GoogleTagManager/Images/GoogleTagManager_32X32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNNJWT" type="Provider" version="09.09.01">
<package name="DNNJWT" type="Provider" version="09.10.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
Expand Up @@ -46,8 +46,8 @@
<LangVersion>7</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClientDependency.Core, Version=1.9.2.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.2.7\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.9.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Instrumentation">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/DotNetNuke.Web.Client/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dnn.ClientDependency" version="1.9.2.7" targetFramework="net472" />
<package id="Dnn.ClientDependency" version="1.9.10" targetFramework="net472" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net472" developmentDependency="true" />
Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Deterministic>true</Deterministic>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.09.01">
<package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.10.01">
<friendlyName>DNN Deprecated Web Controls Library</friendlyName>
<description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
<dependencies/>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj
Expand Up @@ -79,8 +79,8 @@
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="ClientDependency.Core, Version=1.9.2.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.2.7\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.9.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/DotNetNuke.Web/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dnn.ClientDependency" version="1.9.2.7" targetFramework="net45" />
<package id="Dnn.ClientDependency" version="1.9.10" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi" version="5.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.ClientAPI" type="Library" version="09.09.01" >
<package name="DotNetNuke.ClientAPI" type="Library" version="09.10.01" >
<friendlyName>DotNetNuke ClientAPI</friendlyName>
<description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
<dependencies/>
Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Deterministic>true</Deterministic>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.09.01">
<package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.10.01">
<friendlyName>DNN Deprecated Website Codebehind files</friendlyName>
<description>DNN Deprecated Website Codebehind files for backward compability.</description>
<dependencies/>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Library/DotNetNuke.Library.csproj
Expand Up @@ -84,8 +84,8 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.10.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\..\packages\Portable.BouncyCastle.1.8.10\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.9.2.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.2.7\lib\net45\ClientDependency.Core.dll</HintPath>
<Reference Include="ClientDependency.Core, Version=1.9.10.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dnn.ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebControls">
<SpecificVersion>False</SpecificVersion>
Expand Down
42 changes: 21 additions & 21 deletions DNN Platform/Library/packages.config
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dnn.ClientDependency" version="1.9.2.7" targetFramework="net45" />
<package id="MailKit" version="2.13.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.FileSystemGlobbing" version="3.1.1" targetFramework="net472" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MimeKit" version="2.13.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="PetaPoco.Compiled" version="6.0.415" targetFramework="net472" />
<package id="Portable.BouncyCastle" version="1.8.10" targetFramework="net472" />
<package id="QuickIO.NET" version="2.6.2.0" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dnn.ClientDependency" version="1.9.10" targetFramework="net472" />
<package id="MailKit" version="2.13.0" targetFramework="net472" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
<package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.FileSystemGlobbing" version="3.1.1" targetFramework="net472" />
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="net472" developmentDependency="true" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MimeKit" version="2.13.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="PetaPoco.Compiled" version="6.0.415" targetFramework="net472" />
<package id="Portable.BouncyCastle" version="1.8.10" targetFramework="net472" />
<package id="QuickIO.NET" version="2.6.2.0" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
</packages>
2 changes: 1 addition & 1 deletion DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.09.01">
<package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.10.01">
<friendlyName>Message Center</friendlyName>
<description>Core Messaging module allows users to message each other.</description>
<iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/DDRMenu/DDRMenu.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DDRMenu" type="Module" isSystem="true" version="09.09.01">
<package name="DDRMenu" type="Module" isSystem="true" version="09.10.01">
<friendlyName>DDR Menu</friendlyName>
<description>DotNetNuke Navigation Provider.</description>
<owner>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.09.01">
<package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.10.01">
<friendlyName>Digital Asset Management</friendlyName>
<description>DotNetNuke Corporation Digital Asset Management module</description>
<iconFile>Images/Files_32x32_Standard.png</iconFile>
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="SiteExportImport" type="Library" isSystem="false" version="09.09.01">
<package name="SiteExportImport" type="Library" isSystem="false" version="09.10.01">
<friendlyName>Site Export Import</friendlyName>
<description>DotNetNuke Corporation Site Export Import Library</description>
<iconFile>Images/Files_32x32_Standard.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Groups/SocialGroups.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Social Groups" type="Module" isSystem="true" version="09.09.01">
<package name="Social Groups" type="Module" isSystem="true" version="09.10.01">
<friendlyName>Social Groups</friendlyName>
<description>DotNetNuke Corporation Social Groups module</description>
<iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/HTML/dnn_HTML.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_HTML" type="Module" version="09.09.01">
<package name="DNN_HTML" type="Module" version="09.10.01">
<friendlyName>HTML</friendlyName>
<description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
<iconFile>DesktopModules\HTML\Images\html.png</iconFile>
Expand Down
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.09.01" >
<package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.10.01" >
<friendlyName>Html Editor Management</friendlyName>
<iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
<description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>
Expand Down
2 changes: 1 addition & 1 deletion DNN Platform/Modules/Journal/Journal.dnn
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Journal" type="Module" isSystem="true" version="09.09.01">
<package name="Journal" type="Module" isSystem="true" version="09.10.01">
<friendlyName>Journal</friendlyName>
<description>DotNetNuke Corporation Journal module</description>
<iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>
Expand Down

0 comments on commit 7e293b9

Please sign in to comment.