From 5e70f0d9baca1be6fef0579bf58ceab924a2dc1a Mon Sep 17 00:00:00 2001
From: "Matt Mitchell (.NET)" <mmitche@microsoft.com>
Date: Fri, 31 Jul 2026 08:09:02 -0700
Subject: [PATCH] Target Helix Job Monitor at NetMinimum

Keep the framework-dependent tool portable across newer runtimes with major-version roll-forward and align its direct publisher dependency with the minimum target.\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>\nCopilot-Session: baa969a4-1d79-4b6a-a3f0-4d349d768b5e
---
 .../Microsoft.DotNet.Helix.AzureDevOpsTestPublisher.csproj  | 6 +++++-
 .../JobMonitor/Microsoft.DotNet.Helix.JobMonitor.csproj     | 3 ++-
 .../JobMonitor/Services/AzureBlobClientFactory.cs           | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.DotNet.Helix/AzureDevOpsTestPublisher/Microsoft.DotNet.Helix.AzureDevOpsTestPublisher.csproj b/src/Microsoft.DotNet.Helix/AzureDevOpsTestPublisher/Microsoft.DotNet.Helix.AzureDevOpsTestPublisher.csproj
index 1fb85d5ed58..fce7b5e9aa4 100644
--- a/src/Microsoft.DotNet.Helix/AzureDevOpsTestPublisher/Microsoft.DotNet.Helix.AzureDevOpsTestPublisher.csproj
+++ b/src/Microsoft.DotNet.Helix/AzureDevOpsTestPublisher/Microsoft.DotNet.Helix.AzureDevOpsTestPublisher.csproj
@@ -1,11 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+  </ItemGroup>
+
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.DotNet.Helix.Sdk.Tests" />
   </ItemGroup>
diff --git a/src/Microsoft.DotNet.Helix/JobMonitor/Microsoft.DotNet.Helix.JobMonitor.csproj b/src/Microsoft.DotNet.Helix/JobMonitor/Microsoft.DotNet.Helix.JobMonitor.csproj
index 83f262452c1..a58bc2876d7 100644
--- a/src/Microsoft.DotNet.Helix/JobMonitor/Microsoft.DotNet.Helix.JobMonitor.csproj
+++ b/src/Microsoft.DotNet.Helix/JobMonitor/Microsoft.DotNet.Helix.JobMonitor.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(BundledNETCoreAppTargetFramework)</TargetFramework>
+    <TargetFramework>$(NetMinimum)</TargetFramework>
     <OutputType>Exe</OutputType>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
+    <RollForward>Major</RollForward>
     <ToolCommandName>dotnet-helix-job-monitor</ToolCommandName>
     <Description>Standalone Helix Job Monitor tool for Azure DevOps pipelines</Description>
   </PropertyGroup>
diff --git a/src/Microsoft.DotNet.Helix/JobMonitor/Services/AzureBlobClientFactory.cs b/src/Microsoft.DotNet.Helix/JobMonitor/Services/AzureBlobClientFactory.cs
index 6b21195f02d..6cbf2ae8012 100644
--- a/src/Microsoft.DotNet.Helix/JobMonitor/Services/AzureBlobClientFactory.cs
+++ b/src/Microsoft.DotNet.Helix/JobMonitor/Services/AzureBlobClientFactory.cs
@@ -17,7 +17,7 @@ public IBlobClient CreateBlobClient(string blobUri, string sasToken = null)
                 return new AzureBlobClient(new BlobClient(new Uri(blobUri), options));
             }
 
-            string strippedUri = blobUri.Contains('?') ? blobUri.Substring(0, blobUri.LastIndexOf('?', StringComparison.Ordinal)) : blobUri;
+            string strippedUri = blobUri.Contains('?') ? blobUri.Substring(0, blobUri.LastIndexOf('?')) : blobUri;
             return new AzureBlobClient(new BlobClient(new Uri(strippedUri), new AzureSasCredential(sasToken), options));
         }