Merge branch 'develop' into remove-evoq-references

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.0.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/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
@@ -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/Tasks/Build.cs

@@ -3,17 +3,22 @@
 // See the LICENSE file in the project root for more information
 namespace DotNetNuke.Build.Tasks
 {
+    using System.Collections.Generic;
+
+    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,28 @@ public override void Run(Context context)
             }
             finally
             {
-                context.Parameters.InputFiles.AddMsBuildBinaryLogFile(cleanLog);
-                context.Parameters.InputFiles.AddMsBuildBinaryLogFile(buildLog);
+                var issues = context.ReadIssues(
+                    new List<IIssueProvider>
+                    {
+                        new MsBuildIssuesProvider(
+                            context.Log,
+                            new MsBuildIssuesSettings(cleanLog, context.MsBuildBinaryLogFileFormat())),
+                        new MsBuildIssuesProvider(
+                            context.Log,
+                            new MsBuildIssuesSettings(buildLog, context.MsBuildBinaryLogFileFormat())),
+                    },
+                    context.Directory("."));
+
+                foreach (var issue in issues)
+                {
+                    context.AzurePipelines()
+                           .Commands.WriteWarning(
+                               issue.MessageText,
+                               new AzurePipelinesMessageData
+                               {
+                                   SourcePath = issue.AffectedFileRelativePath?.FullPath, LineNumber = issue.Line,
+                               });
+                }
             }
         }
 

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>
     {
     }

Build/Tasks/BuildWithDatabase.cs

@@ -9,13 +9,13 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to compile the platform and create a localdb database.</summary>
-    [Dependency(typeof(CleanArtifacts))]
-    [Dependency(typeof(UpdateDnnManifests))]
-    [Dependency(typeof(CreateInstall))]
-    [Dependency(typeof(CreateUpgrade))]
-    [Dependency(typeof(CreateDeploy))]
-    [Dependency(typeof(CreateSymbols))]
-    [Dependency(typeof(CreateDatabase))]
+    [IsDependentOn(typeof(CleanArtifacts))]
+    [IsDependentOn(typeof(UpdateDnnManifests))]
+    [IsDependentOn(typeof(CreateInstall))]
+    [IsDependentOn(typeof(CreateUpgrade))]
+    [IsDependentOn(typeof(CreateDeploy))]
+    [IsDependentOn(typeof(CreateSymbols))]
+    [IsDependentOn(typeof(CreateDatabase))]
     public sealed class BuildWithDatabase : FrostingTask<Context>
     {
     }

Build/Tasks/CopyWebsite.cs

@@ -10,8 +10,8 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to copy the built website folder.</summary>
-    [Dependency(typeof(CleanWebsite))]
-    [Dependency(typeof(GenerateSqlDataProvider))]
+    [IsDependentOn(typeof(CleanWebsite))]
+    [IsDependentOn(typeof(GenerateSqlDataProvider))]
     public sealed class CopyWebsite : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/CreateDeploy.cs

@@ -13,8 +13,8 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to crete the Deploy package.</summary>
-    [Dependency(typeof(PreparePackaging))]
-    [Dependency(typeof(OtherPackages))]
+    [IsDependentOn(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(OtherPackages))]
     public sealed class CreateDeploy : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/CreateInstall.cs

@@ -13,8 +13,8 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to create the Install package.</summary>
-    [Dependency(typeof(PreparePackaging))]
-    [Dependency(typeof(OtherPackages))]
+    [IsDependentOn(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(OtherPackages))]
     public sealed class CreateInstall : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/CreateNugetPackages.cs

@@ -16,7 +16,7 @@ namespace DotNetNuke.Build.Tasks
     using DotNetNuke.Build;
 
     /// <summary>A cake task to create the platform's NuGet packages.</summary>
-    [Dependency(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(PreparePackaging))]
     public sealed class CreateNugetPackages : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/CreateSymbols.cs

@@ -12,8 +12,8 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to create the Symbols package.</summary>
-    [Dependency(typeof(PreparePackaging))]
-    [Dependency(typeof(OtherPackages))]
+    [IsDependentOn(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(OtherPackages))]
     public sealed class CreateSymbols : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/CreateUpgrade.cs

@@ -14,11 +14,11 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to create the Upgrade package.</summary>
-    [Dependency(typeof(PreparePackaging))]
-    [Dependency(typeof(OtherPackages))]
-    [Dependency(typeof(CreateInstall))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
-    [Dependency(typeof(CreateSymbols))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
-    [Dependency(typeof(CreateDeploy))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
+    [IsDependentOn(typeof(PreparePackaging))]
+    [IsDependentOn(typeof(OtherPackages))]
+    [IsDependentOn(typeof(CreateInstall))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
+    [IsDependentOn(typeof(CreateSymbols))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
+    [IsDependentOn(typeof(CreateDeploy))] // This is to ensure CreateUpgrade runs last and not in parallel, can be removed when we get to v10 where the telerik workaround is no longer needed
     public sealed class CreateUpgrade : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/Default.cs

@@ -10,12 +10,12 @@ namespace DotNetNuke.Build.Tasks
 
     /// <summary>A cake task to build the platform and create packages.</summary>
     /// <remarks>This is the default Cake target if no target is supplied.</remarks>
-    [Dependency(typeof(CleanArtifacts))]
-    [Dependency(typeof(UpdateDnnManifests))]
-    [Dependency(typeof(CreateInstall))]
-    [Dependency(typeof(CreateUpgrade))]
-    [Dependency(typeof(CreateDeploy))]
-    [Dependency(typeof(CreateSymbols))]
+    [IsDependentOn(typeof(CleanArtifacts))]
+    [IsDependentOn(typeof(UpdateDnnManifests))]
+    [IsDependentOn(typeof(CreateInstall))]
+    [IsDependentOn(typeof(CreateUpgrade))]
+    [IsDependentOn(typeof(CreateDeploy))]
+    [IsDependentOn(typeof(CreateSymbols))]
     public sealed class Default : FrostingTask<Context>
     {
     }

Build/Tasks/GeneratePackagesChecksums.cs

@@ -15,12 +15,12 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to generate a <c>checksums.md</c> file with the artifact checksums.</summary>
-    [Dependency(typeof(CleanArtifacts))]
-    [Dependency(typeof(UpdateDnnManifests))]
-    [Dependency(typeof(CreateInstall))]
-    [Dependency(typeof(CreateUpgrade))]
-    [Dependency(typeof(CreateDeploy))]
-    [Dependency(typeof(CreateSymbols))]
+    [IsDependentOn(typeof(CleanArtifacts))]
+    [IsDependentOn(typeof(UpdateDnnManifests))]
+    [IsDependentOn(typeof(CreateInstall))]
+    [IsDependentOn(typeof(CreateUpgrade))]
+    [IsDependentOn(typeof(CreateDeploy))]
+    [IsDependentOn(typeof(CreateSymbols))]
     public sealed class GeneratePackagesChecksums : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/GenerateSecurityAnalyzerChecksums.cs

@@ -12,7 +12,7 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to generate the <c>Default.aspx</c> checksum for the Security Analyzer.</summary>
-    [Dependency(typeof(SetVersion))]
+    [IsDependentOn(typeof(SetVersion))]
     public sealed class GenerateSecurityAnalyzerChecksums : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/GenerateSqlDataProvider.cs

@@ -10,7 +10,7 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to generate a SQL Data Provider script if it doesn't exist.</summary>
-    [Dependency(typeof(SetVersion))]
+    [IsDependentOn(typeof(SetVersion))]
     public sealed class GenerateSqlDataProvider : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/OtherPackages.cs

@@ -16,12 +16,12 @@ namespace DotNetNuke.Build.Tasks
     using Dnn.CakeUtils;
 
     /// <summary>A cake task to include other 3rd party packages.</summary>
-    [Dependency(typeof(PackageNewtonsoft))]
-    [Dependency(typeof(PackageMailKit))]
-    [Dependency(typeof(PackageAspNetWebApi))]
-    [Dependency(typeof(PackageAspNetWebPages))]
-    [Dependency(typeof(PackageAspNetMvc))]
-    [Dependency(typeof(PackageMicrosoftGlobbing))]
+    [IsDependentOn(typeof(PackageNewtonsoft))]
+    [IsDependentOn(typeof(PackageMailKit))]
+    [IsDependentOn(typeof(PackageAspNetWebApi))]
+    [IsDependentOn(typeof(PackageAspNetWebPages))]
+    [IsDependentOn(typeof(PackageAspNetMvc))]
+    [IsDependentOn(typeof(PackageMicrosoftGlobbing))]
     public sealed class OtherPackages : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/PreparePackaging.cs

@@ -11,10 +11,10 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Json;
 
     /// <summary>A cake task to prepare for packaging (by building the platform and copying files).</summary>
-    [Dependency(typeof(CopyWebsite))]
-    [Dependency(typeof(Build))]
-    [Dependency(typeof(CopyWebConfig))]
-    [Dependency(typeof(CopyWebsiteBinFolder))]
+    [IsDependentOn(typeof(CopyWebsite))]
+    [IsDependentOn(typeof(Build))]
+    [IsDependentOn(typeof(CopyWebConfig))]
+    [IsDependentOn(typeof(CopyWebsiteBinFolder))]
     public sealed class PreparePackaging : FrostingTask<Context>
     {
         /// <inheritdoc/>

Build/Tasks/ResetDevSite.cs

@@ -9,9 +9,9 @@ namespace DotNetNuke.Build.Tasks
     using Cake.Frosting;
 
     /// <summary>A cake task to reset a local dev site.</summary>
-    [Dependency(typeof(BuildToTempFolder))]
-    [Dependency(typeof(CopyToDevSite))]
-    [Dependency(typeof(CopyWebConfigToDevSite))]
+    [IsDependentOn(typeof(BuildToTempFolder))]
+    [IsDependentOn(typeof(CopyToDevSite))]
+    [IsDependentOn(typeof(CopyWebConfigToDevSite))]
     public sealed class ResetDevSite : FrostingTask<Context>
     {
     }

Build/Tasks/RunUnitTests.cs

@@ -11,7 +11,7 @@ namespace DotNetNuke.Build.Tasks
 
     /// <summary>A cake task to run NUnit 3 tests.</summary>
     /// <remarks>This task is not used (NUnit 3 is not used by DNN), you probably want <see cref="UnitTests"/>.</remarks>
-    [Dependency(typeof(Build))]
+    [IsDependentOn(typeof(Build))]
     public sealed class RunUnitTests : FrostingTask<Context>
     {
         /// <inheritdoc/>