Merge branch 'main' into fix/code_spell_1139

gvatsal60 · web-flow · commit cab9fa669b2d · 2026-04-06T20:33:47.000+05:30
diff --git a/test/azure-cli/scenarios.json b/test/azure-cli/scenarios.json
@@ -89,7 +89,7 @@
     }
   },
   "install_azcli_dotnet_dockerindocker_trixie": {
-    "image": "mcr.microsoft.com/devcontainers/dotnet:dev-10.0-preview-trixie",
+    "image": "mcr.microsoft.com/devcontainers/base:trixie",
     "user": "vscode",
     "features": {
       "azure-cli": {
diff --git a/test/nix/scenarios.json b/test/nix/scenarios.json
@@ -14,7 +14,7 @@
         "features": {
             "nix": {
                 "multiUser": false,
-                "version": "2.10"
+                "version": "2.18"
             }
         }
     },

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@`
`89`	`89`	`}`
`90`	`90`	`},`
`91`	`91`	`"install_azcli_dotnet_dockerindocker_trixie": {`
`92`		`- "image": "mcr.microsoft.com/devcontainers/dotnet:dev-10.0-preview-trixie",`
	`92`	`+ "image": "mcr.microsoft.com/devcontainers/base:trixie",`
`93`	`93`	`"user": "vscode",`
`94`	`94`	`"features": {`
`95`	`95`	`"azure-cli": {`