Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoshLozensky
JoshLozensky committed Jan 23, 2025
2 parents 53f9899 + dc651ea commit d24a08e
Show file tree
Hide file tree
Showing 10 changed files with 64 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<!-- This should be passed from the VSTS build -->
<MicrosoftIdentityAbstractionsVersion Condition="'$(MicrosoftIdentityAbstractionsVersion)' == ''">7.3.0</MicrosoftIdentityAbstractionsVersion>
<MicrosoftIdentityAbstractionsVersion Condition="'$(MicrosoftIdentityAbstractionsVersion)' == ''">8.0.2</MicrosoftIdentityAbstractionsVersion>
<!-- This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion -->
<Version>$(MicrosoftIdentityAbstractionsVersion)</Version>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)\build\35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand All @@ -26,7 +26,7 @@
<Nullable>enable</Nullable>
<LangVersion>12</LangVersion>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
<PackageValidationBaselineVersion>8.0.0</PackageValidationBaselineVersion>
<BannedApiAnalyzersVersion>3.3.4</BannedApiAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzers>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzers>
<MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
Expand Down
7 changes: 7 additions & 0 deletions changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
8.0.0
========
## Fundamentals:
- Removed the Container and ValueOrReference from the public API of CredentialDescription. They were technical debt used for compatibility
with Microsoft.Identity.Web 1.x, no longer necessary. See [PR #151](https://github.com/AzureAD/microsoft-identity-abstractions-for-dotnet/pull/151)
for details.

7.2.1
========
## Bug fix:
Expand Down
44 changes: 42 additions & 2 deletions src/Microsoft.Identity.Abstractions/ApplicationOptions/CredentialDescription.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Security.Cryptography.X509Certificates;
Expand All @@ -17,6 +18,45 @@ namespace Microsoft.Identity.Abstractions
/// </summary>
public class CredentialDescription
{
/// <summary>
/// Default constructor.
/// </summary>
public CredentialDescription()
{

}

/// <summary>
/// Copy constructor for <see cref="CredentialDescription"/>
/// </summary>
/// <param name="other">CredentialDescription to copy.</param>
public CredentialDescription(CredentialDescription other)
{
#if NET8_0_OR_GREATER
ArgumentNullException.ThrowIfNull(other);
#else
if (other == null)
throw new ArgumentNullException(nameof(other));
#endif
SourceType = other.SourceType;
KeyVaultUrl = other.KeyVaultUrl;
KeyVaultCertificateName = other.KeyVaultCertificateName;
CertificateStorePath = other.CertificateStorePath;
CertificateDistinguishedName = other.CertificateDistinguishedName;
CertificateThumbprint = other.CertificateThumbprint;
CertificateDiskPath = other.CertificateDiskPath;
CertificatePassword = other.CertificatePassword;
Base64EncodedValue = other.Base64EncodedValue;
ClientSecret = other.ClientSecret;
ManagedIdentityClientId = other.ManagedIdentityClientId;
SignedAssertionFileDiskPath = other.SignedAssertionFileDiskPath;
DecryptKeysAuthenticationOptions = other.DecryptKeysAuthenticationOptions;
Certificate = other.Certificate;
CachedValue = other.CachedValue;
Skip = other.Skip;
TokenExchangeUrl = other.TokenExchangeUrl;
}

private string? _cachedId;

/// <summary>
Expand Down Expand Up @@ -56,7 +96,7 @@ public string Id
/// this value is the path to the credential in the cert store, for instance <c>CurrentUser/My</c>.</item>
/// </list>
/// </remarks>
public string? Container
internal string? Container
{
get
{
Expand Down Expand Up @@ -339,7 +379,7 @@ public string? Container
/// this value is the thumbprint.</item>
/// </list>
/// </remarks>
public string? ReferenceOrValue
internal string? ReferenceOrValue
{
get
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Identity.Abstractions/CompatibilitySuppressions.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/en-us/dotnet/fundamentals/package-validation/diagnostic-ids -->
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>CP0006</DiagnosticId>
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.Identity.Abstractions/Properties/InternalVisibleTo.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("Microsoft.Identity.Abstractions.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001002D96616729B54F6D013D71559A017F50AA4861487226C523959D1579B93F3FDF71C08B980FD3130062B03D3DE115C4B84E7AC46AEF5E192A40E7457D5F3A08F66CEAB71143807F2C3CB0DA5E23B38F0559769978406F6E5D30CEADD7985FC73A5A609A8B74A1DF0A29399074A003A226C943D480FEC96DBEC7106A87896539AD")]
5 changes: 1 addition & 4 deletions src/Microsoft.Identity.Abstractions/PublicAPI/net462/PublicAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RelativePath.
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.get -> bool
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.set -> void
Microsoft.Identity.Abstractions.CredentialDescription
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription(Microsoft.Identity.Abstractions.CredentialDescription! other) -> void
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2?
Expand All @@ -78,8 +79,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.get
Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Container.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Container.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription() -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialType.get -> Microsoft.Identity.Abstractions.CredentialType
Microsoft.Identity.Abstractions.CredentialDescription.DecryptKeysAuthenticationOptions.get -> Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions?
Expand All @@ -91,8 +90,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Skip.get -> bool
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Identity.Abstractions/PublicAPI/net8.0/PublicAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RelativePath.
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.get -> bool
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.set -> void
Microsoft.Identity.Abstractions.CredentialDescription
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription(Microsoft.Identity.Abstractions.CredentialDescription! other) -> void
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2?
Expand All @@ -78,8 +79,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.get
Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Container.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Container.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription() -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialType.get -> Microsoft.Identity.Abstractions.CredentialType
Microsoft.Identity.Abstractions.CredentialDescription.DecryptKeysAuthenticationOptions.get -> Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions?
Expand All @@ -91,8 +90,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Skip.get -> bool
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Identity.Abstractions/PublicAPI/netstandard2.0/PublicAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RelativePath.
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.get -> bool
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.set -> void
Microsoft.Identity.Abstractions.CredentialDescription
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription(Microsoft.Identity.Abstractions.CredentialDescription! other) -> void
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2?
Expand All @@ -78,8 +79,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.get
Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Container.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Container.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription() -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialType.get -> Microsoft.Identity.Abstractions.CredentialType
Microsoft.Identity.Abstractions.CredentialDescription.DecryptKeysAuthenticationOptions.get -> Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions?
Expand All @@ -91,8 +90,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Skip.get -> bool
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.Identity.Abstractions/PublicAPI/netstandard2.1/PublicAPI.Shipped.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RelativePath.
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.get -> bool
Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions.RequestAppToken.set -> void
Microsoft.Identity.Abstractions.CredentialDescription
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription(Microsoft.Identity.Abstractions.CredentialDescription! other) -> void
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Base64EncodedValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Certificate.get -> System.Security.Cryptography.X509Certificates.X509Certificate2?
Expand All @@ -78,8 +79,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.get
Microsoft.Identity.Abstractions.CredentialDescription.CertificateThumbprint.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ClientSecret.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Container.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.Container.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialDescription() -> void
Microsoft.Identity.Abstractions.CredentialDescription.CredentialType.get -> Microsoft.Identity.Abstractions.CredentialType
Microsoft.Identity.Abstractions.CredentialDescription.DecryptKeysAuthenticationOptions.get -> Microsoft.Identity.Abstractions.AuthorizationHeaderProviderOptions?
Expand All @@ -91,8 +90,6 @@ Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.KeyVaultUrl.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ManagedIdentityClientId.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.ReferenceOrValue.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.get -> string?
Microsoft.Identity.Abstractions.CredentialDescription.SignedAssertionFileDiskPath.set -> void
Microsoft.Identity.Abstractions.CredentialDescription.Skip.get -> bool
Expand Down
2 changes: 2 additions & 0 deletions test/Microsoft.Identity.Abstractions.Tests/Microsoft.Identity.Abstractions.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<LangVersion>12</LangVersion>
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>../../build/MSAL.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit d24a08e

Please sign in to comment.