Merge pull request #194 from ptr727/develop

Develop
ptr727 · Jul 26, 2024 · ef86a8b · ef86a8b
2 parents 947546c + 3306bf8
commit ef86a8b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,25 +4,40 @@ updates:
 
   # main
 - package-ecosystem: "nuget"
-  directory: "/"
   target-branch: "main"
+  directory: "/"
   schedule:
     interval: "daily"
+  groups:
+    nuget-deps:
+      patterns:
+        - "*"
 - package-ecosystem: "github-actions"
-  directory: "/"
   target-branch: "main"
+  directory: "/"
   schedule:
     interval: "daily"
+  groups:
+    actions-deps:
+      patterns:
+        - "*"
 
   # develop
 - package-ecosystem: "nuget"
-  directory: "/"
   target-branch: "develop"
+  directory: "/"
   schedule:
     interval: "daily"
+  groups:
+    nuget-deps:
+      patterns:
+        - "*"
 - package-ecosystem: "github-actions"
-  directory: "/"
   target-branch: "develop"
+  directory: "/"
   schedule:
     interval: "daily"
-
+  groups:
+    actions-deps:
+      patterns:
+        - "*"
diff --git a/.github/workflows/DependabotAutoMerge.yml b/.github/workflows/DependabotAutoMerge.yml
@@ -28,7 +28,6 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Auto-merge dependabot non-major updates
-        # Only auto-merge non-major updates
         if: steps.metadata.outputs.update-type != 'version-update:semver-major'
         run: gh pr merge --auto --merge "$PR_URL"
         env:

diff --git a/Utilities.code-workspace b/Utilities.code-workspace
@@ -19,7 +19,9 @@
 		},
 		"[plaintext]": {
 			"files.trimTrailingWhitespace": false
-		}
+		},
+		"diffEditor.ignoreTrimWhitespace": false,
+		"editor.renderWhitespace": "trailing"
 	},
 	"extensions": {
 		"recommendations": [