Merge pull request #5320 from dnnsoftware/release/9.11.0

Merged `release/9.11.0` into `master` to release v9.11.0

.github/BUILD.md

@@ -11,11 +11,10 @@ When contributing to DNN, you'd typically go through steps 2 and 3 at least and
 
 ## External sources
 
-There are two projects not included in this repository that are distributed with DNN:
-* [CKEditorProvider](https://github.com/DNN-Connect/CKEditorProvider) - The default HTML Editor Provider
+There is one project not included in this repository that are distributed with DNN:
 * [CDF](https://github.com/dnnsoftware/ClientDependency) - The Dnn Client Dependency Framework
 
-If you wish to make changes to those, please keep this in mind.
+If you wish to make changes to that project, please keep this in mind.
 
 ## Used Build Technologies
 
@@ -154,7 +153,7 @@ If a build fails midway and you have tracked artifacts, you can simply run:
 
 ### Troubleshooting
 
-If you encounter PowerShell security issues, please read [Cake - PowerShell Security](https://cakebuild.net/docs/tutorials/powershell-security).
+If you encounter PowerShell security issues, please read [Cake - PowerShell Security](http://cakebuildbotdevelop.azurewebsites.net/docs/tutorials/powershell-security).
 
 If you encouter Yarn issues, please [update Yarn to the lastest version](https://yarnpkg.com/getting-started/install).
 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -41,6 +41,7 @@ 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.11.00 release candidate
 * [ ] 09.10.02 release candidate
 * [ ] 09.10.01 latest supported release
 

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://dnncommunity.org/forums
     about: Get help, solicit feedback and discuss new ideas regarding DNN Platform.
   - name: DNN Documentation
-    url: https://dnndocs.com
-    about: Learn more about DNN Platform.
+    url: https://docs.dnncommunity.org
+    about: Learn more about DNN Platform.

.github/workflows/image-actions.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Compress Images
         id: compress_images
@@ -34,7 +34,7 @@ jobs:
       - name: Create Pull Request
         if: | # If it's not a Pull Request then commit any changes as a new PR.
           github.event_name != 'pull_request' && steps.compress_images.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@v3.10.1
+        uses: peter-evans/create-pull-request@v4
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

.github/workflows/open-merged-pr-to-future.yml

@@ -0,0 +1,32 @@
+name: Open Merged PR to release/10.0.0 Branch
+
+on: workflow_dispatch
+#  pull_request:
+#    types: [closed]
+#    branches:
+#      - develop
+
+jobs:
+  open-merged-pr-to-release-branch:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.merged }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: peterjgrainger/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          branch: v10/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.sha }}
+
+      - name: Create Pull Request
+        uses: repo-sync/[email protected]
+        with:
+          source_branch: v10/${{ github.event.pull_request.head.ref }}-${{ github.event.pull_request.head.sha }}
+          destination_branch: release/10.0.0
+          pr_title: v10 ${{ github.event.pull_request.title }}
+          pr_body: |
+            Applying #${{ github.event.pull_request.number }} to release/10.0.0
+            ${{ github.event.pull_request.body }}
+          pr_label: ${{ join(github.event.pull_request.labels.*.name) }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/updateVersions.yml

@@ -7,30 +7,35 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.ref_type == 'branch' && startsWith(github.event.ref, 'release/') }}
     steps:
-    - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v3
 
-    - name: Get the release branch version
-      uses: valadas/[email protected]
-      id: branchVersion
-
-    - name: Set versions
-      uses: valadas/[email protected]
-      with:
-        version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }}
-        skipFile: './Build/Tasks/unversionedManifests.txt'
-        includeSolutionInfo: true
-        includeIssueTemplates: true
-        includePackageJson: true
-        includeDnnReactCommon: true
-    - name: Create Pull Request
-      uses: peter-evans/[email protected]
-      with:
-        commit-message: Updates versions as per release candidate creation
-        title: Updates versions as per release candidate creation
-        body: This is a release management task and we are self-approving it for that reason.
-        # A comma separated list of labels.
-        labels: 'Type: Build/Release'
-        # The pull request branch name.
-        branch: update-versions/patch
-        # The branch suffix type.
-        branch-suffix: short-commit-hash
+      - name: Get the release branch version
+        uses: valadas/[email protected]
+        id: branchVersion
+
+      - name: Set versions
+        uses: valadas/[email protected]
+        with:
+          version: ${{ steps.branchVersion.outputs.manifestSafeVersionString }}
+          skipFile: "./Build/Tasks/unversionedManifests.txt"
+          includeSolutionInfo: true
+          includeIssueTemplates: true
+          includePackageJson: true
+          includeDnnReactCommon: true
+
+      - name: Update Yarn versions
+        shell: pwsh
+        run: yarn install --mode=update-lockfile --no-immutable
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: Updates versions as per release candidate creation
+          title: Updates versions as per release candidate creation
+          body: This is a release management task and we are self-approving it for that reason.
+          # A comma separated list of labels.
+          labels: "Type: Build/Release"
+          # The pull request branch name.
+          branch: update-versions/patch
+          # The branch suffix type.
+          branch-suffix: short-commit-hash

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.0.2.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

Build/Build.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net4.8</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -14,21 +14,20 @@
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.BuildSystems.Module" Version="3.0.3" />
-    <PackageReference Include="Cake.FileHelpers" Version="4.0.1" />
-    <PackageReference Include="Cake.Frosting" Version="1.2.0" />
-    <PackageReference Include="Cake.Frosting.Issues.Recipe" Version="1.3.1" />
-    <PackageReference Include="Cake.Git" Version="1.1.0" />
-    <PackageReference Include="Cake.Issues" Version="1.0.0" />
+    <PackageReference Include="Cake.BuildSystems.Module" Version="4.1.0" />
+    <PackageReference Include="Cake.FileHelpers" Version="5.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="2.2.0" />
+    <PackageReference Include="Cake.Git" Version="2.0.0" />
+    <PackageReference Include="Cake.Issues" Version="2.0.0-beta0001" />
     <PackageReference Include="Cake.Issues.MsBuild" Version="1.0.0" />
-    <PackageReference Include="Cake.Json" Version="6.0.1" />
-    <PackageReference Include="Cake.XdtTransform" Version="1.0.0" />
+    <PackageReference Include="Cake.Json" Version="7.0.1" />
+    <PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
     <PackageReference Include="Dnn.CakeUtils" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
   </ItemGroup>
 </Project>

Build/BuildScripts/AEModule.build

@@ -1,7 +1,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" 
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Yarn.MSBuild.1.22.10\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.22.10\build\Yarn.MSBuild.props')" />
-  <Import Project="..\..\packages\Yarn.MSBuild.1.22.10\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.22.10\build\Yarn.MSBuild.targets')" />
+  <Import Project="..\..\packages\Yarn.MSBuild.1.22.17\build\Yarn.MSBuild.props" Condition="Exists('..\..\packages\Yarn.MSBuild.1.22.17\build\Yarn.MSBuild.props')" />
+  <Import Project="..\..\packages\Yarn.MSBuild.1.22.17\build\Yarn.MSBuild.targets" Condition="Exists('..\..\packages\Yarn.MSBuild.1.22.17\build\Yarn.MSBuild.targets')" />
 
   <PropertyGroup>
     <ResourceZipWorkingDirectory>$(MSBuildProjectDirectory)\Package\Resources\admin\personaBar</ResourceZipWorkingDirectory>
@@ -17,7 +17,7 @@
       <PersonaBar-css Include="admin/personaBar/**/css/**/*" />
       <PersonaBar-resources Include="admin/personaBar/**/App_LocalResources/*.resx" />
       <PersonaBar-controls Include="admin/personaBar/**/UserControls/*.ascx" />
-      <PersonaBar-scripts Include="admin/personaBar/**/scripts/*;admin/personaBar/**/scripts/**/*" />
+      <PersonaBar-scripts Include="admin/personaBar/**/scripts/**/*" />
       <Resources Include="@(PersonaBar-views);@(PersonaBar-images);@(PersonaBar-css);@(PersonaBar-scripts);@(PersonaBar-data);@(PersonaBar-resources);@(PersonaBar-controls)" Exclude="**/node_modules/**/*" />
     </ItemGroup>
   </Target>

Build/Context.cs

@@ -12,16 +12,16 @@ namespace DotNetNuke.Build
     using Cake.Common.IO.Paths;
     using Cake.Common.Tools.GitVersion;
     using Cake.Core;
-    using Cake.Frosting.Issues.Recipe;
+    using Cake.Frosting;
     using Cake.Json;
 
     /// <inheritdoc/>
-    public class Context : IssuesContext
+    public class Context : FrostingContext
     {
         /// <summary>Initializes a new instance of the <see cref="Context"/> class.</summary>
         /// <param name="context">The base context.</param>
         public Context(ICakeContext context)
-            : base(context, RepositoryInfoProviderType.CakeGit)
+            : base(context)
         {
             try
             {

Build/Program.cs

@@ -8,7 +8,6 @@ namespace DotNetNuke.Build
 
     using Cake.AzurePipelines.Module;
     using Cake.Frosting;
-    using Cake.Frosting.Issues.Recipe;
 
     /// <summary>Runs the build process.</summary>
     public class Program
@@ -17,7 +16,7 @@ public class Program
         internal const string MicrosoftTestPlatformVersion = "16.11.0";
 
         /// <summary>The version of the NUnit3TestAdapter NuGet package.</summary>
-        internal const string NUnit3TestAdapterVersion = "4.0.0";
+        internal const string NUnit3TestAdapterVersion = "4.2.1";
 
         /// <summary>Runs the build process.</summary>
         /// <param name="args">The arguments from the command line.</param>
@@ -34,7 +33,6 @@ public static int Main(string[] args)
                 .InstallTool(new Uri("nuget:?package=NUnit3TestAdapter&version=" + NUnit3TestAdapterVersion))
                 .InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.10.0"))
                 .InstallTool(new Uri("nuget:?package=Cake.Issues.MsBuild&version=1.0.0"))
-                .AddAssembly(Assembly.GetAssembly(typeof(IssuesTask)))
                 .Run(args);
         }
     }

Build/Symbols/DotNetNuke_Symbols.dnn

@@ -1,11 +1,11 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" version="09.10.02" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.11.00" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>
-        <name>DNN Corporation</name>
-        <organization>.NET Foundation</organization>
+        <name>.NET Foundation and Contributors</name>
+        <organization>DNN Community</organization>
         <url>https://dnncommunity.org</url>
         <email>[email protected]</email>
       </owner>

Build/Tasks/Build.cs

@@ -3,17 +3,22 @@
 // See the LICENSE file in the project root for more information
 namespace DotNetNuke.Build.Tasks
 {
+    using System;
+    using System.Linq;
+
+    using Cake.Common.Build;
+    using Cake.Common.Build.AzurePipelines.Data;
+    using Cake.Common.IO;
     using Cake.Common.Tools.MSBuild;
     using Cake.Core.IO;
     using Cake.Frosting;
-    using Cake.Frosting.Issues.Recipe;
-
+    using Cake.Issues;
+    using Cake.Issues.MsBuild;
     using DotNetNuke.Build;
 
     /// <summary>A cake task to compile the platform.</summary>
-    [Dependency(typeof(CleanWebsite))]
-    [Dependency(typeof(RestoreNuGetPackages))]
-    [IsDependeeOf(typeof(ReadIssuesTask))]
+    [IsDependentOn(typeof(CleanWebsite))]
+    [IsDependentOn(typeof(RestoreNuGetPackages))]
     public sealed class Build : FrostingTask<Context>
     {
         /// <inheritdoc/>
@@ -36,8 +41,29 @@ public override void Run(Context context)
             }
             finally
             {
-                context.Parameters.InputFiles.AddMsBuildBinaryLogFile(cleanLog);
-                context.Parameters.InputFiles.AddMsBuildBinaryLogFile(buildLog);
+                var issueProviders =
+                    from logFilePath in new[] { cleanLog, buildLog, }
+                    where context.FileExists(logFilePath)
+                    let settings = new MsBuildIssuesSettings(logFilePath, context.MsBuildBinaryLogFileFormat())
+                    select new MsBuildIssuesProvider(context.Log, settings);
+                var issues = context.ReadIssues(issueProviders, context.Directory("."));
+                foreach (var issue in issues)
+                {
+                    var messageData = new AzurePipelinesMessageData
+                    {
+                        SourcePath = issue.AffectedFileRelativePath?.FullPath,
+                        LineNumber = issue.Line,
+                    };
+
+                    if (string.Equals(issue.PriorityName, "Error", StringComparison.Ordinal))
+                    {
+                        context.AzurePipelines().Commands.WriteError(issue.MessageText, messageData);
+                    }
+                    else
+                    {
+                        context.AzurePipelines().Commands.WriteWarning(issue.MessageText, messageData);
+                    }
+                }
             }
         }
 

Build/Tasks/BuildAll.cs

@@ -4,21 +4,19 @@
 namespace DotNetNuke.Build.Tasks
 {
     using Cake.Frosting;
-    using Cake.Frosting.Issues.Recipe;
 
     /// <summary>A cake task to compile the platform and create all of the packages.</summary>
     /// <remarks>This is the task run during CI.</remarks>
-    [Dependency(typeof(CleanArtifacts))]
-    [Dependency(typeof(UpdateDnnManifests))]
-    [Dependency(typeof(GenerateSecurityAnalyzerChecksums))]
-    [Dependency(typeof(SetPackageVersions))]
-    [Dependency(typeof(CreateInstall))]
-    [Dependency(typeof(CreateUpgrade))]
-    [Dependency(typeof(CreateDeploy))]
-    [Dependency(typeof(CreateSymbols))]
-    [Dependency(typeof(CreateNugetPackages))]
-    [Dependency(typeof(GeneratePackagesChecksums))]
-    [IsDependentOn(typeof(IssuesTask))]
+    [IsDependentOn(typeof(CleanArtifacts))]
+    [IsDependentOn(typeof(UpdateDnnManifests))]
+    [IsDependentOn(typeof(GenerateSecurityAnalyzerChecksums))]
+    [IsDependentOn(typeof(SetPackageVersions))]
+    [IsDependentOn(typeof(CreateInstall))]
+    [IsDependentOn(typeof(CreateUpgrade))]
+    [IsDependentOn(typeof(CreateDeploy))]
+    [IsDependentOn(typeof(CreateSymbols))]
+    [IsDependentOn(typeof(CreateNugetPackages))]
+    [IsDependentOn(typeof(GeneratePackagesChecksums))]
     public sealed class BuildAll : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/BuildServerSetVersion.cs

@@ -9,7 +9,7 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to update the build number in CI.</summary>
-    [Dependency(typeof(SetVersion))]
+    [IsDependentOn(typeof(SetVersion))]
     public sealed class BuildServerSetVersion : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/BuildToTempFolder.cs

@@ -9,11 +9,11 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to build the platform.</summary>
-    [Dependency(typeof(SetVersion))]
-    [Dependency(typeof(UpdateDnnManifests))]
-    [Dependency(typeof(ResetDatabase))]
-    [Dependency(typeof(PreparePackaging))]
-    [Dependency(typeof(OtherPackages))]
+    [IsDependentOn(typeof(SetVersion))]
+    [IsDependentOn(typeof(UpdateDnnManifests))]
+    [IsDependentOn(typeof(ResetDatabase))]
+    [IsDependentOn(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(OtherPackages))]
     public sealed class BuildToTempFolder : FrostingTask<Context>
     {
     }