Merge pull request #6879 from dnnsoftware/release/10.2.1

Released v10.2.1

Author: valadas

.editorconfig

@@ -185,6 +185,8 @@ csharp_prefer_braces = true:silent
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
 
+csharp_preferred_modifier_order = public, private, protected, internal, static, required, abstract, virtual, sealed, override, new, readonly, extern, unsafe, volatile, async:suggestion
+
 # ReSharper properties
 resharper_instance_members_qualify_members = field, property, event, method
 resharper_csharp_wrap_arguments_style = chop_if_long

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -72,7 +72,7 @@ body:
         **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:
-        - 10.1.2 (latest v10 release)
+        - 10.2.0 (latest v10 release)
         - Current development branch (unreleased)
     validations:
       required: true

.github/workflows/image-actions.yml

@@ -35,7 +35,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@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           title: Auto Compress Images
           branch-suffix: timestamp

.github/workflows/updateVersions.yml

@@ -28,7 +28,7 @@ jobs:
         run: yarn install --mode=update-lockfile --no-immutable
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           commit-message: Updates versions as per release candidate creation
           title: Updates versions as per release candidate creation

Build/Build.csproj

@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
     <RootNamespace>DotNetNuke.Build</RootNamespace>
+    <TargetFramework>net10.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>Recommended</AnalysisMode>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
+    <WarningsNotAsErrors>CS0618,CA1305,CA1716,CA1725,CA5351</WarningsNotAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />

Build/BuildScripts/AEModule.build

@@ -6,7 +6,7 @@
     <WorkingDirectory>$(RootDirectory)</WorkingDirectory>
   </PropertyGroup>
 
-  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package"></Target>
+  <Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package" />
   <Target Name="GetFiles">
     <ItemGroup>
       <PersonaBar-views Include="admin/personaBar/**/*.html" />

Build/BuildScripts/Module.build

@@ -1,6 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package">
-  </Target>
+  <Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;UpdateFiles;DebugProject;Package" />
   <Target Name="GetFiles">
     <ItemGroup>
       <TextFiles Include="*.txt" Exclude="license.txt;releasenotes.txt" />

Build/BuildScripts/Provider.build

@@ -1,6 +1,5 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package">
-  </Target>
+  <Target Name="CopyAndPackage" BeforeTargets="Build" DependsOnTargets="CopyBin;GetFiles;DebugProject;Package" />
   <Target Name="GetFiles">
     <ItemGroup>
       <TextFiles Include="*.txt" Exclude="license.txt;releasenotes.txt" />

Build/Lifetime.cs

@@ -14,6 +14,8 @@ namespace DotNetNuke.Build
     /// <inheritdoc/>
     public sealed class Lifetime : FrostingLifetime<Context>
     {
+        private static readonly string[] CorepackToolNames = ["corepack", "corepack.cmd",];
+
         /// <inheritdoc/>
         public override void Setup(Context context, ISetupContext setupContext)
         {
@@ -26,7 +28,7 @@ public override void Setup(Context context, ISetupContext setupContext)
                 Git(context, "commit --allow-empty -m 'backup'");
             }
 
-            if (context.Tools.Resolve(new[] { "corepack", "corepack.cmd", }) is null)
+            if (context.Tools.Resolve(CorepackToolNames) is null)
             {
                 throw new CakeException("Could not find corepack, Node.js 18 or later must be installed.");
             }

Build/LocalSettings.cs

@@ -34,7 +34,7 @@ public class LocalSettings
         public string DatabasePath { get; set; } = string.Empty;
 
         /// <summary>Gets or sets a value indicating whether to copy the sample projects to the build output.</summary>
-        public bool CopySampleProjects { get; set; } = false;
+        public bool CopySampleProjects { get; set; }
 
         /// <summary>Gets or sets the version to use for the build.</summary>
         public string Version { get; set; } = "auto";