Merge branch 'release/5.0.0'

WildGums · Dec 14, 2023 · 6848178 · 6848178
2 parents fc4bf46 + 093d61c
commit 6848178
Show file tree

Hide file tree

Showing 94 changed files with 9,991 additions and 8,918 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.1.0",
+      "version": "3.2.0",
       "commands": [
         "dotnet-cake"
       ]

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,38 +1,33 @@
 ### Description of Change ###
 
-<!-- Describe your changes here. -->
+<!-- Describe your changes here -->
 
 ### Issues Resolved ### 
+
 <!-- Please use the format "fixes #xxxx" for each issue this PR addresses -->
 
 - fixes #
 
 ### API Changes ###
+
 <!-- List all API changes here (or just put None) -->
 
 None
 
-### Platforms Affected ### 
-<!-- Please list all platforms affected by these changes -->
-
-- All
-- WPF
-- UWP
-- iOS
-- Android
-
 ### Behavioral Changes ###
+
 <!-- Describe any changes that may change how a user's app behaves or appears when upgrading to this version of the codebase. -->
 
 None
 
 ### Testing Procedure ###
+
 <!-- Please list the steps that should be taken to properly test these changes on each relevant platform. If you were unable to test these changes yourself on any or all platforms, please let us know. Also, if you are able to attach a video of your test run, you will be our personal hero. -->
 
 ### PR Checklist ###
 
 - [ ] I have included examples or tests
 - [ ] I have updated the change log
 - [ ] I am listed in the CONTRIBUTORS file
-- [ ] Rebased on top of the target branch at time of PR
 - [ ] Changes adhere to coding standard
+- [ ] I checked the licenses of Third Party software and discussed new dependencies with at least 1 other team member
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,15 @@
 version: 2
+registries:
+  nuget-feed-default:
+    type: nuget-feed
+    url: https://api.nuget.org/v3/index.json
+
 updates:
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+
 - package-ecosystem: nuget
   directory: "/"
   schedule:
@@ -8,4 +18,6 @@ updates:
   ignore:
   - dependency-name: "*Analyzers"
     versions:
-    - ">= 0"
+    - ">= 0"
+  registries:
+  - nuget-feed-default
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v1.1.1
+        uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526 #1.6.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve Dependabot PR
@@ -21,14 +21,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Enable auto-merge for Dependabot PRs
         if: |
-            (startsWith(steps.dependabot-metadata.outputs.dependency-names, 'catel.') ||
+            (startsWith(steps.dependabot-metadata.outputs.dependency-names, 'approvaltests.') || 
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'catel.') ||
              startsWith(steps.dependabot-metadata.outputs.dependency-names, 'fody') ||
              endsWith(steps.dependabot-metadata.outputs.dependency-names,   '.fody') ||
              startsWith(steps.dependabot-metadata.outputs.dependency-names, 'microsoft.') ||
              startsWith(steps.dependabot-metadata.outputs.dependency-names, 'nunit') ||
              startsWith(steps.dependabot-metadata.outputs.dependency-names, 'nunit3testadapter') ||
              startsWith(steps.dependabot-metadata.outputs.dependency-names, 'orc.') || 
-             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'orchestra.')) &&
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'orchestra.') ||
+             startsWith(steps.dependabot-metadata.outputs.dependency-names, 'verify.')) &&
             (steps.dependabot-metadata.outputs.update-type == 'version-update:semver-minor' ||
              steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch')
         run: gh pr merge --auto --merge "$PR_URL"

diff --git a/.gitignore b/.gitignore
@@ -135,10 +135,17 @@ TestResults
 .github/
 BundleArtifacts/
 
+# docker / tye
+.tye
+
 # editors
 .idea
 .vscode
 
+# Binaries
+*.dll
+*.exe
+
 # fody
 FodyWeavers.xsd
 
@@ -148,3 +155,7 @@ FodyWeavers.xsd
 # ANTLR
 data/dsl/*.class
 data/dsl/*.java
+
+# Nodejs / NPM
+node_modules
+package-lock.json
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,3 +1,3 @@
 mode: ContinuousDeployment
 assembly-versioning-scheme: MajorMinorPatch 
-next-version: 4.0.0
+next-version: 5.0.0
diff --git a/cake.config b/cake.config
@@ -1,4 +1,11 @@
 ; The configuration file for Cake.
 
 [Settings]
-SkipVerification=true
+SkipVerification=true
+
+[Settings]
+EnableScriptCache=true
+
+[Paths]
+; Cache=%temp%/cake-build/cache/
+; Note: cache-path is set via environment variables