Merge pull request #5827 from dnnsoftware/release/9.13.0

Merged `release/9.13.0` into `master` to release `v9.13.0`
dnnsoftware · Sep 27, 2023 · 1388ac7 · 1388ac7
2 parents 0d7c4a4 + c7b6f1c
commit 1388ac7
Show file tree

Hide file tree

Showing 542 changed files with 31,608 additions and 25,843 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -60,19 +60,21 @@ body:
       label: Anything else?
       description: | 
         Links? References? Anything that will give us more context about the issue you are encountering!
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+        _Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in._
     validations:
       required: false
   - type: dropdown
     id: affected-versions
     attributes:
       label: Affected Versions
-      description: What versions of DNN are you running?
+      description: | 
+        What version of DNN are you running?
+        **NOTE:** _If your version is not listed, please upgrade to the latest version. If you cannot upgrade at this time, please open a [Discussion](https://github.com/dnnsoftware/Dnn.Platform/discussions) instead._
       multiple: true
       options:
+        - 9.12.0 (latest release)
+        - 9.13.0 (release candidate)
         - 10.0.0 (alpha)
-        - 9.11.2 (latest release)
     validations:
       required: true
   - type: dropdown

diff --git a/.github/workflows/image-actions.yml b/.github/workflows/image-actions.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Compress Images
         id: compress_images

diff --git a/.github/workflows/open-merged-pr-to-future.yml b/.github/workflows/open-merged-pr-to-future.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.merged }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: peterjgrainger/[email protected]
         env:

diff --git a/.github/workflows/updateVersions.yml b/.github/workflows/updateVersions.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get the release branch version
         uses: valadas/[email protected]

diff --git a/.gitignore b/.gitignore
@@ -145,3 +145,6 @@ yarn-error.log
 /Build/bin/
 /.dotnet/
 /Build/Tools/
+
+/DotNetNuke.Internal.SourceGenerators/bin/
+/DNN Platform/Tests/DotNetNuke.Tests.SourceGenerators/Snapshots/*.received.*
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -14,18 +14,18 @@
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.BuildSystems.Module" Version="4.2.0" />
-    <PackageReference Include="Cake.FileHelpers" Version="5.0.0" />
-    <PackageReference Include="Cake.Frosting" Version="2.3.0" />
-    <PackageReference Include="Cake.Git" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues" Version="2.0.0" />
-    <PackageReference Include="Cake.Issues.MsBuild" Version="2.0.0" />
+    <PackageReference Include="Cake.BuildSystems.Module" Version="5.0.0" />
+    <PackageReference Include="Cake.FileHelpers" Version="6.1.3" />
+    <PackageReference Include="Cake.Frosting" Version="3.1.0" />
+    <PackageReference Include="Cake.Git" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues" Version="3.0.0" />
+    <PackageReference Include="Cake.Issues.MsBuild" Version="3.0.0" />
     <PackageReference Include="Cake.Json" Version="7.0.1" />
     <PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
-    <PackageReference Include="Cake.Yarn" Version="0.4.8" />
+    <PackageReference Include="Cake.Yarn" Version="2.0.0" />
     <PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />
     <PackageReference Include="MSBuild.StructuredLogger" Version="2.1.820" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Build/Lifetime.cs b/Build/Lifetime.cs
@@ -14,7 +14,7 @@ namespace DotNetNuke.Build
     public sealed class Lifetime : FrostingLifetime<Context>
     {
         /// <inheritdoc/>
-        public override void Setup(Context context)
+        public override void Setup(Context context, ISetupContext setupContext)
         {
             context.IsRunningInCI = context.HasEnvironmentVariable("TF_BUILD");
             context.Information("Is Running in CI : {0}", context.IsRunningInCI);

diff --git a/Build/Tasks/packaging.json b/Build/Tasks/packaging.json
@@ -19,6 +19,7 @@
     "/bin/Dnn.PersonaBar.*",
     "/bin/DotNetNuke.Authentication.*",
     "/bin/DotNetNuke.Modules.*",
+    "/bin/DotNetNuke.Internal.*",
     "/bin/DotNetNuke.Web.Deprecated.dll",
     "/bin/DotNetNuke.Website.Deprecated.dll",
     "/bin/System.IdentityModel.Tokens.Jwt.*",

diff --git a/Build/Tasks/thirdparty.json b/Build/Tasks/thirdparty.json
@@ -1,44 +1,64 @@
-[
-  {
-    "name": "jQuery",
-    "folder": "DNN Platform/JavaScript Libraries/jQuery/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "jQueryMigrate",
-    "folder": "DNN Platform/JavaScript Libraries/jQueryMigrate/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "jQueryUI",
-    "folder": "DNN Platform/JavaScript Libraries/jQueryUI/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "Knockout",
-    "folder": "DNN Platform/JavaScript Libraries/Knockout/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "KnockoutMapping",
-    "folder": "DNN Platform/JavaScript Libraries/KnockoutMapping/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "Selectize",
-    "folder": "DNN Platform/JavaScript Libraries/Selectize/",
-    "destination": "Install/JavaScriptLibrary"
-  },
-  {
-    "name": "Microsoft.CodeDom.Providers.DotNetCompilerPlatform",
-    "folder": "DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/",
-    "destination": "Install/Library",
-    "extension": "resources"
-  },
-  {
-    "name": "MicrosoftFileSystemGlobbing",
-    "folder": "DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/",
-    "destination": "Install/Library",
-    "excludes": [ "**/*.xml" ]
-  }
-]
+[
+  {
+    "name": "DnnPlugins",
+    "folder": "DNN Platform/JavaScript Libraries/DnnPlugins/",
+    "destination":  "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "HoverIntent",
+    "folder": "DNN Platform/JavaScript Libraries/HoverIntent/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "jQuery",
+    "folder": "DNN Platform/JavaScript Libraries/jQuery/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "jQuery.Fileupload",
+    "folder": "DNN Platform/JavaScript Libraries/jQuery.Fileupload/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "jQuery.iframe-transport",
+    "folder": "DNN Platform/JavaScript Libraries/jQuery.iframe-transport/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "jQueryMigrate",
+    "folder": "DNN Platform/JavaScript Libraries/jQueryMigrate/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "jQueryUI",
+    "folder": "DNN Platform/JavaScript Libraries/jQueryUI/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "Knockout",
+    "folder": "DNN Platform/JavaScript Libraries/Knockout/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "KnockoutMapping",
+    "folder": "DNN Platform/JavaScript Libraries/KnockoutMapping/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "Selectize",
+    "folder": "DNN Platform/JavaScript Libraries/Selectize/",
+    "destination": "Install/JavaScriptLibrary"
+  },
+  {
+    "name": "Microsoft.CodeDom.Providers.DotNetCompilerPlatform",
+    "folder": "DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/",
+    "destination": "Install/Library",
+    "extension": "resources"
+  },
+  {
+    "name": "MicrosoftFileSystemGlobbing",
+    "folder": "DNN Platform/Components/Microsoft.Extensions.FileSystemGlobbing/",
+    "destination": "Install/Library",
+    "excludes": [ "**/*.xml" ]
+  }
+]
diff --git a/Build/Tasks/unversionedManifests.txt b/Build/Tasks/unversionedManifests.txt
@@ -3,5 +3,8 @@ DNN Platform/Components/Microsoft.*/**/*.dnn
 DNN Platform/Components/Newtonsoft/*.dnn
 DNN Platform/Components/WebFormsMvp/*.dnn
 DNN Platform/Components/SharpZipLib/*.dnn
-DNN Platform/JavaScript Libraries/**/*.dnn
+DNN Platform/JavaScript Libraries/HoverIntent/*.dnn
+DNN Platform/JavaScript Libraries/jQuery*/*.dnn
+DNN Platform/JavaScript Libraries/Knockout*/*.dnn
+DNN Platform/JavaScript Libraries/Selectize/*.dnn
 Temp/**/*.dnn
diff --git a/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec b/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec
@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.9" />
       <dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.9" />
-      <dependency id="NewtonSoft.Json" version="10.0.3" />
+      <dependency id="NewtonSoft.Json" version="13.0.3" />
       <dependency id="DotNetNuke.Web" version="$version$" />
     </dependencies>
   </metadata>

diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj
@@ -36,7 +36,7 @@
     <DocumentationFile>bin\Dnn.Modules.Console.XML</DocumentationFile>
     <NoWarn>
     </NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -49,7 +49,7 @@
     <DocumentationFile>bin\Dnn.Modules.Console.XML</DocumentationFile>
     <NoWarn>
     </NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn
@@ -2,7 +2,7 @@
     <packages>
         <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.12.00">
             <friendlyName>Dnn Azure Connector</friendlyName>
-            <description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
+            <description>The Azure Connector allows you to create folders mapped to Azure Storage accounts.</description>
             <iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
           <dependencies>
             <dependency type="CoreVersion">09.02.00</dependency>

diff --git a/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj b/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj
@@ -27,8 +27,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.AzureConnector.xml</DocumentationFile>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NoWarn>1591</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -39,7 +40,8 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.AzureConnector.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Cloud_Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,7 +52,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.AzureConnector.xml</DocumentationFile>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Cloud_Release|AnyCPU' ">
@@ -62,16 +64,15 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Dnn.AzureConnector.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Components\WindowsAzure\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/DNN Platform/Connectors/Azure/packages.config b/DNN Platform/Connectors/Azure/packages.config
@@ -4,6 +4,6 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
 </packages>
diff --git a/DNN Platform/Connectors/GoogleAnalytics/App_LocalResources/SharedResources.resx b/DNN Platform/Connectors/GoogleAnalytics/App_LocalResources/SharedResources.resx
@@ -121,7 +121,7 @@
     <value>Delete Connection</value>
   </data>
   <data name="ConnectorName.Text" xml:space="preserve">
-    <value>Google Analytics Core Connector</value>
+    <value>Google Analytics (Legacy UA) Connector</value>
   </data>
   <data name="TrackAdministrators.Text" xml:space="preserve">
     <value>Track for Administrators:</value>

diff --git a/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj b/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj
@@ -26,7 +26,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\DNN.Connectors.GoogleAnalytics.xml</DocumentationFile>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -39,7 +39,8 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\DNN.Connectors.GoogleAnalytics.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Cloud_Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,7 +51,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\DNN.Connectors.GoogleAnalytics.xml</DocumentationFile>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Cloud_Release|AnyCPU' ">
@@ -62,12 +63,11 @@
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\DNN.Connectors.GoogleAnalytics.xml</DocumentationFile>
     <NoWarn>1591</NoWarn>
-    <LangVersion>7</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.cs b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.cs
@@ -16,7 +16,7 @@ namespace DNN.Connectors.GoogleAnalytics
     /// <summary>Connector to provide configuration for Google Analytics support.</summary>
     public class GoogleAnalyticsConnector : IConnector
     {
-        private const string DefaultDisplayName = "Google Analytics";
+        private const string DefaultDisplayName = "Google Analytics (Legacy UA)";
 
         private string displayName;
 

diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn
@@ -1,8 +1,8 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
         <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.12.00">
-            <friendlyName>Google Analytics Connector</friendlyName>
-            <description>Configure your sites Google Analytics settings.</description>
+            <friendlyName>Google Analytics (Legacy UA) Connector</friendlyName>
+            <description>Configure your site's Google Analytics settings using Universal Analytics.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
           <dependencies>
             <dependency type="CoreVersion">09.02.00</dependency>

diff --git a/DNN Platform/Connectors/GoogleAnalytics/packages.config b/DNN Platform/Connectors/GoogleAnalytics/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="StyleCop.Analyzers" version="1.1.118" targetFramework="net472" developmentDependency="true" />
 </packages>