Merge pull request #794 from valadas/release/1.8.0

Release v1.8.0
valadas · Jan 1, 2025 · 723ffe4 · 723ffe4
2 parents 155c21f + c3e9b38
commit 723ffe4
Show file tree

Hide file tree

Showing 52 changed files with 533 additions and 580 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,17 +6,14 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    directory: "/Eraware_Dnn_Spa_Ef_Di_Stencil/module.web"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "nuget"
-    directory: "/Eraware_Dnn_Spa_Ef_Di_Stencil/build"
+    directories:
+      - "Eraware_Dnn_Spa_Ef_Di_Stencil/module.web"
+      - "Eraware_PersonaBarModuleTemplate/module.web"
+      - "Eraware_Dnn_Spa_Ef_Di_Stencil/module/docfx_project"
     schedule:
       interval: "monthly"
   - package-ecosystem: "nuget"
-    directories:
-      - "/Eraware_Dnn_Templates"
-      - "/Eraware_Dnn_Spa_Ef_Di_Stencil"
+    directory: "/"
     schedule:
       interval: "monthly"
     ignore:

diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -35,15 +35,15 @@ jobs:
     name: windows-latest
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: 'Run: CI'
         run: ./build.cmd CI
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Publish: artifacts'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: artifacts
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -1,19 +1,49 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "$ref": "#/definitions/build",
-  "title": "Build Schema",
   "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": [
+        "CI",
+        "Clean",
+        "Compile",
+        "Release",
+        "Restore",
+        "SetVersion"
+      ]
+    },
+    "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"
@@ -23,25 +53,8 @@
           "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",
@@ -70,47 +83,42 @@
           "type": "array",
           "description": "List of targets to be skipped. Empty list skips all dependencies",
           "items": {
-            "type": "string",
-            "enum": [
-              "CI",
-              "Clean",
-              "Compile",
-              "Release",
-              "Restore",
-              "SetVsixVersion"
-            ]
+            "$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": [
-              "CI",
-              "Clean",
-              "Compile",
-              "Release",
-              "Restore",
-              "SetVsixVersion"
-            ]
+            "$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"
           ]
+        },
+        "Solution": {
+          "type": "string",
+          "description": "Path to a solution file that is automatically loaded"
         }
       }
+    },
+    {
+      "$ref": "#/definitions/NukeBuild"
     }
-  }
+  ]
 }
diff --git a/Eraware_Dnn_Spa_Ef_Di_Stencil/Eraware_Dnn_Spa_Ef_Di_Stencil.csproj b/Eraware_Dnn_Spa_Ef_Di_Stencil/Eraware_Dnn_Spa_Ef_Di_Stencil.csproj
@@ -85,14 +85,13 @@
     <Content Include="build\docs\images\Package.gif" />
     <Content Include="IntegrationTests\IntegrationTests.vstemplate" />
     <Content Include="IntegrationTests\ProjectTemplate.csproj" />
+    <Content Include="module.web\eslint.config.mjs" />
     <Content Include="module\docfx_project\.gitignore" />
     <Content Include="module\docfx_project\adjust-toc-namespaces.js" />
     <None Include="IntegrationTests\app.Config" />
-    <None Include="module.web\.eslintignore" />
     <None Include="module.web\api-extractor.json" />
     <None Include="module.web\src\components\my-component\usage\javascript.md" />
     <None Include="module.web\src\components\my-component\usage\dnn.md" />
-    <None Include="module.web\src\components\my-create\my-create.scss" />
     <None Include="module.web\src\components\my-edit\my-edit.scss" />
     <None Include="module.web\src\components\my-item-details\my-item-details.scss" />
     <None Include="module.web\src\components\my-items-list\my-items-list.scss" />
@@ -127,7 +126,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="module.web\.gitignore" />
-    <None Include="module.web\.eslintrc.json" />
     <None Include="module\.editorconfig" />
     <None Include="module\.github\dependabot.yml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -248,7 +246,6 @@
   <ItemGroup>
     <TypeScriptCompile Include="module.web\src\components.d.ts" />
     <TypeScriptCompile Include="module.web\src\components\my-component\my-component.tsx" />
-    <TypeScriptCompile Include="module.web\src\components\my-create\my-create.tsx" />
     <TypeScriptCompile Include="module.web\src\components\my-edit\my-edit.tsx" />
     <TypeScriptCompile Include="module.web\src\components\my-item-details\my-item-details.tsx" />
     <TypeScriptCompile Include="module.web\src\components\my-items-list\my-items-list.tsx" />

diff --git a/Eraware_Dnn_Spa_Ef_Di_Stencil/IntegrationTests/ProjectTemplate.csproj b/Eraware_Dnn_Spa_Ef_Di_Stencil/IntegrationTests/ProjectTemplate.csproj
@@ -37,16 +37,16 @@
 		<PackageReference Include="DotNetNuke.WebApi" Version="9.13.4" />
 		<PackageReference Include="Effort.EF6" Version="2.2.17" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" />
+		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NSubstitute" Version="5.1.0" />
+		<PackageReference Include="NSubstitute" Version="5.3.0" />
 		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="xunit" Version="2.9.0" />
-		<PackageReference Include="xunit.runner.msbuild" Version="2.9.0">
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.msbuild" Version="2.9.2">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

diff --git a/Eraware_Dnn_Spa_Ef_Di_Stencil/UnitTests/ProjectTemplate.csproj b/Eraware_Dnn_Spa_Ef_Di_Stencil/UnitTests/ProjectTemplate.csproj
@@ -45,16 +45,16 @@
 		<PackageReference Include="DotNetNuke.WebApi" Version="9.13.4" />
 		<PackageReference Include="Effort.EF6" Version="2.2.17" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" />
+		<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NSubstitute" Version="5.1.0" />
+		<PackageReference Include="NSubstitute" Version="5.3.0" />
 		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
-		<PackageReference Include="xunit" Version="2.9.0" />
-		<PackageReference Include="xunit.runner.msbuild" Version="2.9.0">
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.msbuild" Version="2.9.2">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>