From 35e955364559b5539a74336e681f874d51067423 Mon Sep 17 00:00:00 2001
From: Djuradj Kurepa <dkurepa@microsoft.com>
Date: Mon, 27 Apr 2026 17:22:25 +0200
Subject: [PATCH 1/2] fix ef migrations

---
 Directory.Packages.props                     | 1 +
 src/Maestro/Maestro.Data/Maestro.Data.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index f7b89c9ef8..e9cef58897 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -37,6 +37,7 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.4.0" />
     <PackageVersion Include="Microsoft.Build" Version="18.0.2" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="7.0.1" />
     <PackageVersion Include="Microsoft.DncEng.Configuration.Extensions" Version="$(MicrosoftDncEngConfigurationExtensionsVersion)" />
     <PackageVersion Include="Microsoft.DotNet.GitHub.Authentication" Version="$(MicrosoftDotNetGitHubAuthenticationVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="$(MicrosoftDotNetInternalDependencyInjectionTestingVersion)" />
diff --git a/src/Maestro/Maestro.Data/Maestro.Data.csproj b/src/Maestro/Maestro.Data/Maestro.Data.csproj
index 448a648234..fdb18fcd0d 100644
--- a/src/Maestro/Maestro.Data/Maestro.Data.csproj
+++ b/src/Maestro/Maestro.Data/Maestro.Data.csproj
@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.DotNet.GitHub.Authentication" />
     <PackageReference Include="Microsoft.DotNet.Services.Utility" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Data.SqlClient.Extensions.Azure" />
   </ItemGroup>
 
   <ItemGroup>

From d018bc3a0aff667210421c984169140a2791326a Mon Sep 17 00:00:00 2001
From: Djuradj Kurepa <dkurepa@microsoft.com>
Date: Mon, 27 Apr 2026 19:13:25 +0200
Subject: [PATCH 2/2] Make the build green

---
 Directory.Packages.props                               | 10 +++++-----
 .../Maestro.Common/AppCredentials/AppCredential.cs     |  4 ++--
 .../AppCredentials/CredentialResolver.cs               |  4 ++--
 .../AzureDevOpsTokens/AzureDevOpsTokenProvider.cs      |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index e9cef58897..b0c83e5881 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -14,7 +14,7 @@
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.5.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.6.1" />
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.18.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.4.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.6.0" />
     <PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.5.0" />
@@ -37,7 +37,7 @@
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.4.0" />
     <PackageVersion Include="Microsoft.Build" Version="18.0.2" />
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.1" />
-    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0" />
     <PackageVersion Include="Microsoft.DncEng.Configuration.Extensions" Version="$(MicrosoftDncEngConfigurationExtensionsVersion)" />
     <PackageVersion Include="Microsoft.DotNet.GitHub.Authentication" Version="$(MicrosoftDotNetGitHubAuthenticationVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="$(MicrosoftDotNetInternalDependencyInjectionTestingVersion)" />
@@ -57,17 +57,17 @@
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.23.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.3" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.2" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.2" />
diff --git a/src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs b/src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs
index 5ae2778258..efa3e565c6 100644
--- a/src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs
+++ b/src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs
@@ -84,8 +84,8 @@ private static CachedInteractiveBrowserCredential GetInteractiveCredential(strin
     public static AppCredential CreateManagedIdentityCredential(string appId, string managedIdentityId)
     {
         var miCredential = managedIdentityId == "system"
-            ? new ManagedIdentityCredential()
-            : new ManagedIdentityCredential(managedIdentityId);
+            ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+            : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(managedIdentityId));
 
         var appCredential = new ClientAssertionCredential(
             TENANT_ID,
diff --git a/src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs b/src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs
index 7cb9223462..039c674d5f 100644
--- a/src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs
+++ b/src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs
@@ -23,8 +23,8 @@ public static TokenCredential CreateCredential(CredentialResolverOptions options
         if (!string.IsNullOrEmpty(options.ManagedIdentityId))
         {
             return options.ManagedIdentityId == "system"
-                ? new ManagedIdentityCredential()
-                : new ManagedIdentityCredential(options.ManagedIdentityId);
+                ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+                : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(options.ManagedIdentityId));
         }
 
         // 3. Azure CLI authentication setup by the caller (for CI scenarios)
diff --git a/src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs b/src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs
index 746d13ff43..ed19cec576 100644
--- a/src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs
+++ b/src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs
@@ -122,8 +122,8 @@ private static Dictionary<string, TokenCredential> GetCredentials(
             if (!string.IsNullOrEmpty(option.ManagedIdentityId))
             {
                 credentials[account] = option.ManagedIdentityId == "system"
-                    ? new ManagedIdentityCredential()
-                    : new ManagedIdentityCredential(option.ManagedIdentityId);
+                    ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+                    : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(option.ManagedIdentityId));
                 continue;
             }