Merge pull request #4522 from dnnsoftware/release/9.9.0

Merges release/9.9.0 into master in order to release

Author: valadas

.github/BUILD.md

@@ -111,6 +111,35 @@ Once you've created this file every time you click "rebuild" in Visual Studio on
 
 For the Webpack projects it is set up to read from the `settings.local.json` file and use the `WebsitePath` to copy generated js files to their right place.
 
+## Build React Projects
+
+The solution includes a number of React projects. Notably for the PersonaBar (`Dnn.AdminExperience/ClientSide/*`). To build these to your development site you 
+need to use Yarn and scope to the project you're working on. Go to the `package.json` file for the project and find the identifier (name) and use that. So if you're
+working on the Site Settings PersonaBar project, you'll find that file here: `Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json`. Open it up
+and you'll see something like this:
+
+``` json
+{
+  "name": "site_settings",
+  "version": "9.8.1",
+  "private": true,
+  ...
+```
+
+The "key" for this project is "site_settings". Use the following command at the root of the project to build this:
+
+```
+yarn watch --scope site_settings
+```
+
+and the React project will be built to the dev site and yarn will watch for changes you make and rebuild continuously.
+
+## Gotchas
+
+1. Always check your version in the settings.local.json file if something is not quite right. It is important it is set correctly!
+2. After a build to reset your dev site you may find a large number of changed files in Git. You can safely remove all of those changes while you're working on the solution but you must leave the SolutionInfo.cs file intact as it holds the version nr when you press build in Visual Studio!
+3. If you're building a React project make sure to disable the caching in your browser so your changed file is loaded!
+
 ## Tips and tricks
 
 ### Long paths

.github/ISSUE_TEMPLATE/bug-report.md

@@ -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.08.01 release candidate
-* [ ] 09.08.00 latest supported release
+* [ ] 09.09.00 release candidate
+* [ ] 09.08.01 latest supported release
 
 ## Affected browser
 <!-- 

Build/Build.csproj

@@ -8,11 +8,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Cake.FileHelpers" Version="3.3.0" />
-    <PackageReference Include="Cake.Frosting" Version="1.0.0-rc0001" />
+    <PackageReference Include="Cake.Frosting" Version="1.0.0" />
     <PackageReference Include="Cake.Git" Version="0.22.0" />
-    <PackageReference Include="Cake.NuGet" Version="1.0.0-rc0001" />
     <PackageReference Include="Cake.XdtTransform" Version="0.18.1" />
-    <PackageReference Include="Dnn.CakeUtils" Version="1.1.10" />
+    <PackageReference Include="Dnn.CakeUtils" Version="1.1.11" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
   </ItemGroup>

Build/Cake/build.cs

@@ -222,6 +222,7 @@ public override void Run(Context context)
 [Dependency(typeof(CreateUpgrade))]
 [Dependency(typeof(CreateDeploy))]
 [Dependency(typeof(CreateSymbols))]
+[Dependency(typeof(GeneratePackagesChecksums))]
 public sealed class Default : FrostingTask<Context>
 {
 }

Build/Cake/ci.cs

@@ -4,7 +4,7 @@
 
 [Dependency(typeof(CleanArtifacts))]
 [Dependency(typeof(UpdateDnnManifests))]
-[Dependency(typeof(GenerateChecksum))]
+[Dependency(typeof(GenerateSecurityAnalyzerChecksums))]
 [Dependency(typeof(SetPackageVersions))]
 [Dependency(typeof(CreateInstall))]
 [Dependency(typeof(CreateUpgrade))]

Build/Cake/packaging.cs

@@ -1,6 +1,9 @@
 // The tasks create the various DNN release packages (Install, Upgrade, Deploy and Symbols)
 
 using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
 using Cake.Common.Diagnostics;
 using Cake.Common.IO;
 using Cake.Frosting;
@@ -189,3 +192,45 @@ public override void Run(Context context)
         }
     }
 }
+
+[Dependency(typeof(CleanArtifacts))]
+[Dependency(typeof(UpdateDnnManifests))]
+[Dependency(typeof(CreateInstall))]
+[Dependency(typeof(CreateUpgrade))]
+[Dependency(typeof(CreateDeploy))]
+[Dependency(typeof(CreateSymbols))]
+public sealed class GeneratePackagesChecksums : FrostingTask<Context>
+{
+    public override void Run(Context context)
+    {
+        context.Information("Computing packages checksums...");
+
+        var sb = new StringBuilder();
+        sb.AppendLine($"## MD5 Checksums")
+        .AppendLine($"| File       | Checksum |")
+        .AppendLine($"|------------|----------|");
+
+        var files = context.GetFilesByPatterns(context.artifactsFolder, new string[] { "*.zip" });
+        foreach (var file in files)
+        {
+            string hash;
+            var fileName = file.GetFilename();
+            using (var md5 = MD5.Create())
+            {
+                using (var stream = File.OpenRead(file.FullPath))
+                {
+                    var hashBytes = md5.ComputeHash(stream);
+                    hash = BitConverter.ToString(hashBytes).Replace("-", "").ToLowerInvariant();
+                }
+            }
+
+            sb.AppendLine($"| {fileName} | {hash}   |");
+        }
+
+        sb.AppendLine();
+        var filePath = Path.Combine(context.artifactsFolder, "checksums.md");
+        File.WriteAllText(filePath, sb.ToString());
+
+        context.Information($"Saved checksums to {filePath}");
+    }
+}

Build/Cake/thirdparty.json

@@ -40,11 +40,5 @@
     "folder": "DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/",
     "destination": "Install/Library",
     "extension": "resources"
-  },
-  {
-    "name": "Microsoft.CodeDom.Providers.DotNetCompilerPlatform_net46",
-    "folder": "DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform-net46/",
-    "destination": "Install/Library",
-    "extension": "resources"
   }
 ]

Build/Cake/unit-tests.cs

@@ -1,9 +1,7 @@
-using Cake.Common.IO;
-using Cake.Common.Tools.MSBuild;
+using System.Linq;
+
+using Cake.Common.IO;
 using Cake.Common.Tools.VSTest;
-using Cake.Common.Tools.VSWhere;
-using Cake.Common.Tools.VSWhere.Latest;
-using Cake.Core.Diagnostics;
 using Cake.Frosting;
 
 /// <summary>
@@ -14,33 +12,24 @@ public sealed class UnitTests : FrostingTask<Context>
     public override void Run(Context context)
     {
         var testAssemblies = context.GetFiles($@"**\bin\{context.configuration}\DotNetNuke.Tests.*.dll");
-        testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Data.dll");
-        testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Integration.dll");
+        testAssemblies += context.GetFiles($@"**\bin\{context.configuration}\Dnn.PersonaBar.*.Tests.dll");
         testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Utilities.dll");
+        
+        // TODO: address issues to allow these tests to run
+        testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Integration.dll");
         testAssemblies -= context.GetFiles(@"**\DotNetNuke.Tests.Urls.dll");
 
-        foreach (var file in testAssemblies)
-        {
-            context.VSTest(file.FullPath,
-                FixToolPath(context, new VSTestSettings()
-                {
-                    Logger = $"trx;LogFileName={file.GetFilename()}.xml",
-                    Parallel = true,
-                    EnableCodeCoverage = true,
-                    FrameworkVersion = VSTestFrameworkVersion.NET45,
-                    TestAdapterPath = @"tools\NUnitTestAdapter.2.3.0\build"
-                }));
-        }
-    }
-
-// https://github.com/cake-build/cake/issues/1522
-    VSTestSettings FixToolPath(Context context, VSTestSettings settings)
-    {
-// #tool vswhere
-        settings.ToolPath =
-            context.VSWhereLatest(new VSWhereLatestSettings {Requires = "Microsoft.VisualStudio.PackageGroup.TestTools.Core"})
-                .CombineWithFilePath(context.File(@"Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe"));
-        return settings;
+        var vsTestPath = context.GetFiles("tools/Microsoft.TestPlatform.16.8.0/tools/**/vstest.console.exe").First();
+        context.VSTest(
+            testAssemblies,
+            new VSTestSettings
+            {
+                ToolPath = vsTestPath,
+                Logger = "trx",
+                Parallel = true,
+                EnableCodeCoverage = true,
+                TestAdapterPath = @"tools\NUnitTestAdapter.2.3.0\build"
+            });
     }
 }
 

Build/Cake/version.cs

@@ -135,7 +135,7 @@ public override void Run(Context context)
 }
 
 [Dependency(typeof(SetVersion))]
-public sealed class GenerateChecksum : FrostingTask<Context>
+public sealed class GenerateSecurityAnalyzerChecksums : FrostingTask<Context>
 {
     public override void Run(Context context)
     {

Build/Program.cs

@@ -1,38 +1,20 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using Cake.Core;
-using Cake.Core.Configuration;
+
 using Cake.Frosting;
-using Cake.NuGet;
 
-public class Program : IFrostingStartup
+public class Program
 {
     public static int Main(string[] args)
     {
-        // Create the host.
-        var host = new CakeHostBuilder()
-            .WithArguments(args)
-            .UseStartup<Program>()
-            .Build();
-
-        // Run the host.
-        return host.Run();
-    }
-
-    public void Configure(ICakeServices services)
-    {
-        services.UseContext<Context>();
-        services.UseLifetime<Lifetime>();
-        services.UseWorkingDirectory("..");
-
-        // from https://github.com/cake-build/cake/discussions/2931
-        var module = new NuGetModule(new CakeConfiguration(new Dictionary<string, string>()));
-        module.Register(services);
-        
-        services.UseTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"));
-        services.UseTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"));
-        services.UseTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"));
-        services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"));
+        return new CakeHost()
+            .UseContext<Context>()
+            .UseLifetime<Lifetime>()
+            .UseWorkingDirectory("..")
+            .SetToolPath("../tools")
+            .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=NuGet.CommandLine&version=5.8.0"))
+            .Run(args);
     }
 }