From 6ad0c9460ff72b51497e102fde1f3029a1442792 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sun, 29 Dec 2024 18:48:38 -0700
Subject: [PATCH] Rename renovate config back to .json

.json5 was fine, but VS Code doesn't have native support for it, and the popular JSON5 extension doesn't support JSON schema.
---
 .devcontainer/devcontainer.json |  3 +--
 .github/renovate.json           | 21 +++++++++++++++++++++
 .github/renovate.json5          | 21 ---------------------
 .vscode/extensions.json         |  3 +--
 4 files changed, 23 insertions(+), 25 deletions(-)
 create mode 100644 .github/renovate.json
 delete mode 100644 .github/renovate.json5

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3be99af..1a3a008 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,8 +17,7 @@
         "dotjoshjohnson.xml",
         "ms-vscode-remote.remote-containers",
         "ms-azuretools.vscode-docker",
-        "tintoy.msbuild-project-tools",
-        "mrmlnc.vscode-json5"
+        "tintoy.msbuild-project-tools"
       ]
     }
   },
diff --git a/.github/renovate.json b/.github/renovate.json
new file mode 100644
index 0000000..c140014
--- /dev/null
+++ b/.github/renovate.json
@@ -0,0 +1,21 @@
+{
+	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
+	"extends": ["config:recommended"],
+	"semanticCommits": "disabled",
+	"labels": ["dependencies"],
+	"packageRules": [
+		{
+			"matchPackageNames": ["nbgv", "nerdbank.gitversioning"],
+			"groupName": "nbgv and nerdbank.gitversioning updates"
+		},
+		{
+			"matchPackageNames": ["xunit*"],
+			"groupName": "xunit"
+		},
+		{
+			"matchDatasources": ["dotnet-version", "docker"],
+			"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
+			"groupName": "Dockerfile and global.json updates"
+		}
+	]
+}
diff --git a/.github/renovate.json5 b/.github/renovate.json5
deleted file mode 100644
index 76f2fb1..0000000
--- a/.github/renovate.json5
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	$schema: "https://docs.renovatebot.com/renovate-schema.json",
-	extends: ["config:recommended"],
-	semanticCommits: "disabled",
-	labels: ["dependencies"],
-	packageRules: [
-		{
-			matchPackageNames: ["nbgv", "nerdbank.gitversioning"],
-			groupName: "nbgv and nerdbank.gitversioning updates",
-		},
-		{
-			matchPackageNames: ["xunit*"],
-			groupName: "xunit",
-		},
-		{
-			matchDatasources: ["dotnet-version", "docker"],
-			matchDepNames: ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
-			groupName: "Dockerfile and global.json updates",
-		},
-	],
-}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index b289e50..acaf021 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -13,8 +13,7 @@
     "dotjoshjohnson.xml",
     "ms-vscode-remote.remote-containers",
     "ms-azuretools.vscode-docker",
-    "tintoy.msbuild-project-tools",
-    "mrmlnc.vscode-json5"
+    "tintoy.msbuild-project-tools"
   ],
   // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
   "unwantedRecommendations": []