Merge remote-tracking branch 'origin/main'

microsoft · Jan 20, 2025 · 9c073fc · 9c073fc
2 parents ec87552 + 5624589
commit 9c073fc
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 34 deletions.
diff --git a/.github/pipelines/github-packageupdate.yml b/.github/pipelines/github-packageupdate.yml
@@ -53,6 +53,6 @@ extends:
             TargetBranchName: main
             Title: Automatic NuGet package update
             Description: update of NuGet packages
-            WorkItemId: "9421495"
+            WorkItemId: "9678684"
             Pat: $(omexgithubbotinternalpat)
             MergeStrategy: "0"
diff --git a/.github/pipelines/sf-initialize.yml b/.github/pipelines/sf-initialize.yml
@@ -3,7 +3,7 @@
 parameters:
   - name: SdkVersion
     type: string
-    default: "10.1.2448.9590"
+    default: "10.1.2493.9590"
 steps:
   - task: PowerShell@2
     displayName: Install SF ${{parameters.SdkVersion}}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       run: |
         Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser
         $ProgressPreference = 'SilentlyContinue'
-        Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.1.2448.9590.exe
+        Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.1.2493.9590.exe
         .\setup.exe  /accepteula /force /quiet
     - name: Build with dotnet
       run: dotnet build --configuration ${{ matrix.configuration }}

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,39 +5,39 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup Label="Latest DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(LatestSupportedDotNetVersion)' OR '$(IsNetStandard)'">
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.1" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.1" />
   </ItemGroup>
   <ItemGroup Label="Previous DotNet Package Versions. AutoUpdate" Condition="'$(TargetFramework)' == '$(OldestSupportedDotNetVersion)' And '$(OldestSupportedDotNetVersion)' != '$(LatestSupportedDotNetVersion)'">
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" PreserveMajor="true" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.11" PreserveMajor="true" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.12" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" PreserveMajor="true" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.11" PreserveMajor="true" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.12" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" PreserveMajor="true" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" PreserveMajor="true" />
@@ -47,8 +47,8 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" PreserveMajor="true" />
   </ItemGroup>
   <ItemGroup Label="Package Versions. AutoUpdate">
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.7.0" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.7.0" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.7.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.7.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Csharp" Version="4.12.0" />
     <PackageVersion Include="Microsoft.Net.Test.Sdk" Version="17.12.0" />
@@ -58,15 +58,15 @@
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup Label="ServiceFabric packages for Omex Extensions">
-    <PackageVersion Include="Microsoft.ServiceFabric" Version="10.1.2448" />
-    <PackageVersion Include="Microsoft.ServiceFabric.Actors" Version="7.1.2448" />
-    <PackageVersion Include="Microsoft.ServiceFabric.AspNetCore.Abstractions" Version="7.1.2448" />
-    <PackageVersion Include="Microsoft.ServiceFabric.Client.Http" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.ServiceFabric.Services" Version="7.1.2448" />
-    <PackageVersion Include="Microsoft.ServiceFabric.Services.Remoting" Version="7.1.2448" />
-    <PackageVersion Include="ServiceFabric.Mocks" Version="7.2.8" />
+    <PackageVersion Include="Microsoft.ServiceFabric" Version="10.1.2493" />
+    <PackageVersion Include="Microsoft.ServiceFabric.Actors" Version="7.1.2493" />
+    <PackageVersion Include="Microsoft.ServiceFabric.AspNetCore.Abstractions" Version="7.1.2493" />
+    <PackageVersion Include="Microsoft.ServiceFabric.Client.Http" Version="5.0.1" />
+    <PackageVersion Include="Microsoft.ServiceFabric.Services" Version="7.1.2493" />
+    <PackageVersion Include="Microsoft.ServiceFabric.Services.Remoting" Version="7.1.2493" />
+    <PackageVersion Include="ServiceFabric.Mocks" Version="7.2.11" />
   </ItemGroup>
   <ItemGroup Label="Moq pinned to 4.18.4 until SponsorLink is fully removed and new versions are deemed trustworty">
-    <PackageVersion Include="Moq" Version="4.18.4" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "9.0.102",
     "rollForward": "latestMajor"
   }
 }
diff --git a/tests/Diagnostics.HealthChecks.UnitTests/CertificatesValidityHealthCheckTests.cs b/tests/Diagnostics.HealthChecks.UnitTests/CertificatesValidityHealthCheckTests.cs
@@ -149,7 +149,7 @@ public async Task CheckHealthAsync_ShouldReturnUnhealthy_WhenCertificateDoesNotH
 		public async Task CheckHealthAsync_ShouldReturnUnhealthy_WhenCertificateNotExists()
 		{
 			m_certificateReaderMock.Setup(m => m.GetCertificateByCommonName(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<StoreName>()))
-				.Returns<X509Certificate2>(null);
+				.Returns<X509Certificate2>(null!);
 
 			CertificatesValidityHealthCheck healthCheck = new(
 				m_parameters,