Skip to content

Fix ef migrations #6232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkurepa merged 2 commits into from
Apr 28, 2026
Merged

Fix ef migrations #6232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35e9553
fix ef migrations
dkurepa Apr 27, 2026
d018bc3
Make the build green
dkurepa Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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="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)" />
Expand All @@ -56,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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 1 addition & 0 deletions src/Maestro/Maestro.Data/Maestro.Data.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading