Merge branch 'support/5.x' into koershov/mainline-fix

Author: asbjornu

.config/dotnet-tools.json

@@ -0,0 +1,9 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet/.devcontainer/base.Dockerfile
+
+# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
+ARG VARIANT="6.0-bullseye-slim"
+FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>

.devcontainer/Dockerfile

@@ -0,0 +1,42 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/dotnet
+{
+	"name": "C# (.NET)",
+	"runArgs": ["--init"],
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+			"VARIANT": "6.0",
+		}
+	},
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+        "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace",
+        "editor.rulers": [90],
+        "cSpell.words": [
+            "commiting",
+            "gittools",
+            "gitversion"
+        ],
+    },
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-dotnettools.csharp",
+        "EditorConfig.EditorConfig",
+        "streetsidesoftware.code-spell-checker"
+	],
+
+	"postCreateCommand": "dotnet restore src; dotnet build build",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode",
+	"features": {
+		"docker-in-docker": "latest",
+		"git": "latest",
+		"github-cli": "latest",
+		"sshd": "latest",
+		"powershell": "latest"
+	}
+}

.devcontainer/devcontainer.json

@@ -21,7 +21,7 @@ dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = true:warning
+dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
@@ -155,6 +155,12 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+# Alignment
+align_multiline_parameter = true
+
+# Qualify fields with "this."
+csharp_instance_members_qualify_members = field
+
 # IDE0011: Add braces
 dotnet_diagnostic.IDE0011.severity = none
 
@@ -175,3 +181,9 @@ dotnet_diagnostic.CA2208.severity = warning
 
 # CA1810: Initialize reference type static fields inline
 dotnet_diagnostic.CA1810.severity = warning
+
+# CA1816: Dispose methods should call SuppressFinalize
+dotnet_diagnostic.CA1816.severity = warning
+
+# IDE0005: Using directive is unnecessary.
+dotnet_diagnostic.IDE0005.severity = warning

.editorconfig

@@ -1,11 +1,22 @@
 version: 2
 updates:
 - package-ecosystem: nuget
+  labels:
+    - "dependencies"
+  commit-message:
+    prefix: "(deps)"
   directory: "/"
   schedule:
     interval: daily
   open-pull-requests-limit: 10
+  ignore:
+    - dependency-name: "Microsoft.Build"
+      versions: ["16.9.0", "16.11.0"]
 - package-ecosystem: github-actions
+  labels:
+    - "dependencies"
+  commit-message:
+    prefix: "(build deps)"
   directory: "/"
   schedule:
     interval: daily

.github/dependabot.yml

@@ -8,18 +8,18 @@ pull_request_rules:
   - name: Automatic merge on dependabot PR after success CI
     conditions:
       - author~=^dependabot(|-preview)\[bot\]$
+      - '#commits-behind=0' # Only merge up to date pull requests
       - check-success=DotNet Format
-      - check-success=Build (windows-latest)
-      - check-success=Build (ubuntu-latest)
-      - check-success=Build (macos-latest)
-      - check-success=Unit Test (windows-latest)
-      - check-success=Unit Test (ubuntu-latest)
-      - check-success=Unit Test (macos-latest)
       - check-success=Release
+      - check-success=Unit Test code (windows-latest, netcoreapp3.1)
+      - check-success=Unit Test code (ubuntu-latest, netcoreapp3.1)
+      - check-success=Unit Test code (macos-latest, netcoreapp3.1)
+      - check-success=Unit Test code (windows-latest, net5.0)
+      - check-success=Unit Test code (windows-latest, net5.0)
+      - check-success=Unit Test code (windows-latest, net5.0)
+      - repository-full-name=GitTools/GitVersion # Don't auto-merge PRs in forks
     actions:
       merge:
-        method: rebase
-        strict: smart
   - name: Thank contributor
     conditions:
       - merged