Merge pull request #6857 from dnnsoftware/release/10.2.0

Released v10.2.0

Author: valadas

.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.0 (latest v10 release)
+        - 10.1.2 (latest v10 release)
         - Current development branch (unreleased)
     validations:
       required: true

.github/workflows/browserslist-update-db.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Configure git

.github/workflows/image-actions.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Compress Images
         id: compress_images

.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@v5
+      - uses: actions/checkout@v6
 
       - uses: peterjgrainger/action-create-branch@v3.0.0
         env:

.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@v5
+      - uses: actions/checkout@v6
 
       - name: Get the release branch version
         uses: valadas/get-release-branch-version@v1.1.0

.yarnrc.yml

@@ -1,3 +1,5 @@
 compressionLevel: mixed
 
 nodeLinker: node-modules
+
+npmMinimalAgeGate: 1440

Build/Build.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
@@ -15,17 +15,17 @@
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.BuildSystems.Module" Version="7.1.0" />
+    <PackageReference Include="Cake.BuildSystems.Module" Version="8.0.0" />
     <PackageReference Include="Cake.FileHelpers" Version="7.0.0" />
-    <PackageReference Include="Cake.Frosting" Version="5.0.0" />
+    <PackageReference Include="Cake.Frosting" Version="6.0.0" />
     <PackageReference Include="Cake.Frosting.Git" Version="5.0.1" />
-    <PackageReference Include="Cake.Issues" Version="5.5.0" />
-    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.5.0" />
+    <PackageReference Include="Cake.Issues" Version="5.9.1" />
+    <PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.9.1" />
     <PackageReference Include="Cake.Json" Version="7.0.1" />
     <PackageReference Include="Cake.XdtTransform" Version="2.0.0" />
     <PackageReference Include="Dnn.CakeUtils" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Build/BuildScripts/Module.build

@@ -18,7 +18,7 @@
       <Images Include="Images/*.*" />
       <Keys Include="keys/*.*" />
       <ClientScripts Include="ClientScripts/*.*" />
-      <JsFiles Include="js/*.*" />
+      <JsFiles Include="js/*.*;*.js" />
       <Scripts Include="Scripts/*.*" />
       <SharedScripts Include="Scripts/Shared/*.*" />
       <Templates Include="Templates/*.htm" />

Build/ContextExtensions.cs

@@ -4,8 +4,9 @@
 
 namespace DotNetNuke.Build;
 
+using System;
 using System.Diagnostics;
-
+
 using Cake.Common.IO;
 using Cake.Core.IO;
 
@@ -18,6 +19,8 @@ public static class ContextExtensions
     /// <returns>The file version.</returns>
     public static string GetAssemblyFileVersion(this Context context, FilePath assemblyPath)
     {
-        return FileVersionInfo.GetVersionInfo(context.MakeAbsolute(assemblyPath).FullPath).FileVersion;
+        var versionInfo = FileVersionInfo.GetVersionInfo(context.MakeAbsolute(assemblyPath).FullPath);
+        var fileVersion = versionInfo.FileVersion;
+        return Version.TryParse(fileVersion, out _) ? fileVersion : $"{versionInfo.FileMajorPart}.{versionInfo.FileMinorPart}.{versionInfo.FileBuildPart}";
     }
 }

Build/LocalSettings.cs

@@ -33,6 +33,9 @@ public class LocalSettings
         /// <summary>Gets or sets the path to the database files.</summary>
         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;
+
         /// <summary>Gets or sets the version to use for the build.</summary>
         public string Version { get; set; } = "auto";
     }