Merge remote-tracking branch 'origin/main' into microbuild

AArnott · Feb 20, 2024 · ae19920 · ae19920
2 parents be63359 + 7dec010
commit ae19920
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-coverage": {
-      "version": "17.10.1",
+      "version": "17.10.3",
       "commands": [
         "dotnet-coverage"
       ]

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
-FROM mcr.microsoft.com/dotnet/sdk:8.0.100-jammy
+FROM mcr.microsoft.com/dotnet/sdk:8.0.201-jammy
 
 # Installing mono makes `dotnet test` work without errors even for net472.
 # But installing it takes a long time, so it's excluded by default.

diff --git a/.prettierrc.yaml b/.prettierrc.yaml
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -7,6 +7,7 @@
     "ms-dotnettools.csharp",
     "k--kato.docomment",
     "editorconfig.editorconfig",
+    "esbenp.prettier-vscode",
     "pflannery.vscode-versionlens",
     "davidanson.vscode-markdownlint",
     "dotjoshjohnson.xml",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -9,5 +9,16 @@
   "editor.formatOnSave": true,
   "[xml]": {
     "editor.wordWrap": "off"
-  }
+  },
+  // Treat these files as Azure Pipelines files
+  "files.associations": {
+    "**/azure-pipelines/**/*.yml": "azure-pipelines",
+    "azure-pipelines.yml": "azure-pipelines"
+  },
+  // Use Prettier as the default formatter for Azure Pipelines files.
+  // Needs to be explicitly configured: https://github.com/Microsoft/azure-pipelines-vscode#document-formatting
+  "[azure-pipelines]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": false // enable this when the conform
+  },
 }
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,10 +8,10 @@
     <MicroBuildVersion>2.0.149</MicroBuildVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
-    <PackageVersion Include="xunit" Version="2.6.6" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.495" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.201",
     "rollForward": "patch",
     "allowPrerelease": false
   }