Merge pull request #171 from DNNCommunity/release/1.5.0

Release/1.5.0
DNNCommunity · Jan 14, 2025 · 3b3d197 · 3b3d197
2 parents bc382a3 + 0b2a897
commit 3b3d197
Show file tree

Hide file tree

Showing 21 changed files with 823 additions and 610 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -24,21 +24,21 @@ on:
       - 'release/*'
 
 jobs:
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
+  windows-latest:
+    name: windows-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+      - name: 'Cache: .nuke/temp, ~/.nuget/packages'
+        uses: actions/cache@v4
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
-          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-      - name: Run './build.cmd DeployGeneratedFiles'
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
+      - name: 'Run: DeployGeneratedFiles'
         run: ./build.cmd DeployGeneratedFiles
         env:
           GitHubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/PR_Validation.yml b/.github/workflows/PR_Validation.yml
@@ -26,21 +26,21 @@ on:
       - 'release/*'
 
 jobs:
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
+  windows-latest:
+    name: windows-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+      - name: 'Cache: .nuke/temp, ~/.nuget/packages'
+        uses: actions/cache@v4
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
-          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-      - name: Run './build.cmd Package'
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
+      - name: 'Run: Package'
         run: ./build.cmd Package
         env:
           GitHubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -24,21 +24,21 @@ on:
       - 'release/*'
 
 jobs:
-  ubuntu-latest:
-    name: ubuntu-latest
-    runs-on: ubuntu-latest
+  windows-latest:
+    name: windows-latest
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Cache .nuke/temp, ~/.nuget/packages
-        uses: actions/cache@v2
+      - name: 'Cache: .nuke/temp, ~/.nuget/packages'
+        uses: actions/cache@v4
         with:
           path: |
             .nuke/temp
             ~/.nuget/packages
-          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-      - name: Run './build.cmd Release'
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
+      - name: 'Run: Release'
         run: ./build.cmd Release
         env:
           GitHubToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -1,51 +1,79 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
-  "$ref": "#/definitions/build",
   "definitions": {
-    "build": {
-      "type": "object",
+    "Host": {
+      "type": "string",
+      "enum": [
+        "AppVeyor",
+        "AzurePipelines",
+        "Bamboo",
+        "Bitbucket",
+        "Bitrise",
+        "GitHubActions",
+        "GitLab",
+        "Jenkins",
+        "Rider",
+        "SpaceAutomation",
+        "TeamCity",
+        "Terminal",
+        "TravisCI",
+        "VisualStudio",
+        "VSCode"
+      ]
+    },
+    "ExecutableTarget": {
+      "type": "string",
+      "enum": [
+        "BuildFrontEnd",
+        "Clean",
+        "Compile",
+        "Deploy",
+        "DeployBinaries",
+        "DeployFrontEnd",
+        "DeployGeneratedFiles",
+        "GenerateAppConfig",
+        "GenerateReleaseNotes",
+        "InstallNpmPackages",
+        "LogInfo",
+        "Package",
+        "Release",
+        "Restore",
+        "SetLiveServer",
+        "SetManifestVersions",
+        "SetPackagesVersions",
+        "SetRelativeScripts",
+        "SetupGitHubClient",
+        "Swagger",
+        "TagRelease",
+        "Test",
+        "UnitTests",
+        "UpdateTokens",
+        "Watch"
+      ]
+    },
+    "Verbosity": {
+      "type": "string",
+      "description": "",
+      "enum": [
+        "Verbose",
+        "Normal",
+        "Minimal",
+        "Quiet"
+      ]
+    },
+    "NukeBuild": {
       "properties": {
-        "Configuration": {
-          "type": "string",
-          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
-          "enum": [
-            "Debug",
-            "Release"
-          ]
-        },
         "Continue": {
           "type": "boolean",
           "description": "Indicates to continue a previously failed build attempt"
         },
-        "GitHubToken": {
-          "type": "string",
-          "description": "Github token to authenticate in CI"
-        },
         "Help": {
           "type": "boolean",
           "description": "Shows the help text for this build assembly"
         },
         "Host": {
-          "type": "string",
           "description": "Host for execution. Default is 'automatic'",
-          "enum": [
-            "AppVeyor",
-            "AzurePipelines",
-            "Bamboo",
-            "Bitbucket",
-            "Bitrise",
-            "GitHubActions",
-            "GitLab",
-            "Jenkins",
-            "Rider",
-            "SpaceAutomation",
-            "TeamCity",
-            "Terminal",
-            "TravisCI",
-            "VisualStudio",
-            "VSCode"
-          ]
+          "$ref": "#/definitions/Host"
         },
         "NoLogo": {
           "type": "boolean",
@@ -74,85 +102,46 @@
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "BuildFrontEnd",
-              "Clean",
-              "Compile",
-              "Deploy",
-              "DeployBinaries",
-              "DeployFrontEnd",
-              "DeployGeneratedFiles",
-              "GenerateAppConfig",
-              "GenerateReleaseNotes",
-              "InstallNpmPackages",
-              "LogInfo",
-              "Package",
-              "Release",
-              "Restore",
-              "SetLiveServer",
-              "SetManifestVersions",
-              "SetPackagesVersions",
-              "SetRelativeScripts",
-              "SetupGitHubClient",
-              "Swagger",
-              "TagRelease",
-              "Test",
-              "UnitTests",
-              "UpdateTokens",
-              "Watch"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
-        "Solution": {
-          "type": "string",
-          "description": "Path to a solution file that is automatically loaded"
-        },
         "Target": {
           "type": "array",
           "description": "List of targets to be invoked. Default is '{default_target}'",
           "items": {
-            "type": "string",
-            "enum": [
-              "BuildFrontEnd",
-              "Clean",
-              "Compile",
-              "Deploy",
-              "DeployBinaries",
-              "DeployFrontEnd",
-              "DeployGeneratedFiles",
-              "GenerateAppConfig",
-              "GenerateReleaseNotes",
-              "InstallNpmPackages",
-              "LogInfo",
-              "Package",
-              "Release",
-              "Restore",
-              "SetLiveServer",
-              "SetManifestVersions",
-              "SetPackagesVersions",
-              "SetRelativeScripts",
-              "SetupGitHubClient",
-              "Swagger",
-              "TagRelease",
-              "Test",
-              "UnitTests",
-              "UpdateTokens",
-              "Watch"
-            ]
+            "$ref": "#/definitions/ExecutableTarget"
           }
         },
         "Verbosity": {
-          "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",
+          "$ref": "#/definitions/Verbosity"
+        }
+      }
+    }
+  },
+  "allOf": [
+    {
+      "properties": {
+        "Configuration": {
+          "type": "string",
+          "description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
           "enum": [
-            "Minimal",
-            "Normal",
-            "Quiet",
-            "Verbose"
+            "Debug",
+            "Release"
           ]
+        },
+        "GitHubToken": {
+          "type": "string",
+          "description": "Github token to authenticate in CI"
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
         }
       }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
     }
-  }
-}
+  ]
+}
diff --git a/Module.csproj b/Module.csproj
@@ -27,7 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\Dnn.Modules.SecurityCenter.xml</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -92,16 +92,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetNuke.Core">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Instrumentation">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Web">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.WebApi">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core">
       <Version>5.2.9</Version>

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -77,19 +77,19 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Abstractions">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Core">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Instrumentation">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.Web">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="DotNetNuke.WebApi">
-      <Version>9.11.1</Version>
+      <Version>9.13.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel">
       <Version>17.3.2</Version>