Merge remote-tracking branch 'origin/v3.6' into dev/andarno/libtempla…

…teUpdate
dotnet · Dec 8, 2024 · 85ab0ad · 85ab0ad
2 parents c72a1e0 + 3205ff6
commit 85ab0ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -33,12 +33,13 @@
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageVersion Include="System.Drawing.Common" Version="4.7.3" />
     <PackageVersion Include="System.Diagnostics.Tools" Version="4.3.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="4.7.3" />
     <PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="4.7.1" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
     <PackageVersion Include="Validation" Version="2.5.51" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -87,9 +87,9 @@ stages:
     strategy:
       matrix:
         macOS_Catalina:
-          vmImage: macOS-12
+          vmImage: macOS-14
         macOS_Monterey:
-          vmImage: macOS-12
+          vmImage: macOS-14
     pool:
       vmImage: $[ variables['vmImage'] ]
     steps:
@@ -109,7 +109,7 @@ stages:
           imageName: windows-2022
           repoDir: '${USERPROFILE}/source/repos'
         macOS:
-          imageName: macOS-12
+          imageName: macOS-14
           repoDir: '~/git'
     pool:
       vmImage: $(imageName)