Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Azure.CodeSigning.Sdk" Version="0.1.164" />
<PackageVersion Include="Azure.Core" Version="1.51.1" />
<PackageVersion Include="Azure.Identity" Version="1.17.1" />
<PackageVersion Include="Azure.Core" Version="1.52.0" />
<PackageVersion Include="Azure.Identity" Version="1.19.0" />
<PackageVersion Include="Azure.Security.KeyVault.Certificates" Version="4.8.0" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.8.0" />
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.9.0" />
<PackageVersion Include="AzureSign.Core" Version="7.0.1" />
<PackageVersion Include="coverlet.collector" Version="8.0.0" />
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.9" />
<PackageVersion Include="Microsoft.Dynamics.BusinessCentral.Sip.Main" Version="24.0.15760" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.13.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
<!-- Only use release versions. Pre-release versions are signed with an untrusted certificate. -->
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
<!-- We're staying on 4.18.4 until we migrate to another mocking framework.
Expand All @@ -28,9 +28,9 @@
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="NuGet.Packaging" Version="7.3.0" />
<PackageVersion Include="NuGet.Protocol" Version="7.3.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.3" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.3" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.3" />
<PackageVersion Include="System.Text.Json" Version="10.0.3" />
<PackageVersion Include="System.CommandLine" Version="2.0.5" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.5" />
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.5" />
<PackageVersion Include="System.Text.Json" Version="10.0.5" />
</ItemGroup>
</Project>
11 changes: 8 additions & 3 deletions src/Sign.Cli/AzureCredentialOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,21 @@ internal DefaultAzureCredentialOptions CreateDefaultAzureCredentialOptions(Parse
string? managedIdentityClientId = parseResult.GetValue(ManagedIdentityClientIdOption);
if (managedIdentityClientId is not null)
{
return new ManagedIdentityCredential(managedIdentityClientId);
ManagedIdentityId managedIdentityId = ManagedIdentityId.FromUserAssignedClientId(managedIdentityClientId);

return new ManagedIdentityCredential(managedIdentityId);
}

string? managedIdentityResourceId = parseResult.GetValue(ManagedIdentityResourceIdOption);
if (managedIdentityResourceId is not null)
{
return new ManagedIdentityCredential(new ResourceIdentifier(managedIdentityResourceId));
ResourceIdentifier resourceIdentifier = new(managedIdentityResourceId);
ManagedIdentityId managedIdentityId = ManagedIdentityId.FromUserAssignedResourceId(resourceIdentifier);

return new ManagedIdentityCredential(managedIdentityId);
}

return new ManagedIdentityCredential();
return new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned);

case AzureCredentialType.WorkloadIdentity:
return new WorkloadIdentityCredential();
Expand Down