Merge branch 'main' into fengga/mac-broker-console-app-support

fengga · fengga · commit e50a97b87d5b · 2025-05-30T10:55:56.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+4.72.1
+=======
+ 
+### Bug Fixes
+- Ensure instance of IMsalHttpClientFactory passed by the user is used for managed identity flows that do not require cert validation. See [Issue #5286](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5286)
+
 4.72.0
 =======
 ### Features
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -144,5 +144,5 @@ For MAUI, edit the .csproj and enable the mobile targets.
 You can create a package from Visual Studio or from the command line with custom version parameters:
 
 ```bash
-msbuild <msal>.csproj /t:pack /p:MsalClientSemVer=1.2.3-preview
+msbuild <msal>.csproj /t:pack /p:MicrosoftIdentityClientVersion=1.2.3-preview
 ```
diff --git a/build/template-OneBranch-CI-libsandsamples.yaml b/build/template-OneBranch-CI-libsandsamples.yaml
@@ -4,7 +4,7 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'release'
-  MsalClientSemVer: '4.60.0-devopsbuild' 
+  MicrosoftIdentityClientVersion: '4.60.0-devopsbuild' 
   MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
 
 steps:
@@ -82,6 +82,6 @@ steps:
   displayName: 'Build solution ${{ parameters.Solution }}'
   inputs:
     solution: ${{ parameters.Solution }}
-    msbuildArgs: '/p:RunCodeAnalysis=false /p:MsalClientSemVer=${{ parameters.MsalClientSemVer }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
+    msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
     platform: ${{ parameters.BuildPlatform }}
     configuration: ${{ parameters.BuildConfiguration }}
diff --git a/build/template-OneBranch-Release-libsandsamples.yaml b/build/template-OneBranch-Release-libsandsamples.yaml
@@ -5,15 +5,15 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'release'
-  MsalClientSemVer: '4.55.0-devopsbuild'
+  MicrosoftIdentityClientVersion: '4.55.0-devopsbuild'
   MsalSourceDir: 'microsoft-authentication-library-for-dotnet\' #Default MSAL Location
 
 steps:
 
 - template: template-OneBranch-CI-libsandsamples.yaml
   parameters:
     Solution: 'microsoft-authentication-library-for-dotnet/LibsAndSamples.sln'
-    MsalClientSemVer: $(MsalClientSemVer) #Default MSAL package version
+    MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion) #Default MSAL package version
     MsalSourceDir: $(MsalSourceDir) #Default MSAL root directory
     PipelineType: $(PipelineType) #Build type
 
diff --git a/build/template-build-and-prep-automation.yaml b/build/template-build-and-prep-automation.yaml
@@ -15,7 +15,7 @@ steps:
   parameters:
     BuildPlatform: '$(BuildPlatform)'
     BuildConfiguration: '$(BuildConfiguration)'
-    MsalClientSemVer: $(MsalClientSemVer)
+    MicrosoftIdentityClientVersion: $(MicrosoftIdentityClientVersion)
     Solution: 'LibsAndSamples.sln'    
 
 - task: CopyFiles@2
diff --git a/build/template-restore-build-libsandsamples.yaml b/build/template-restore-build-libsandsamples.yaml
@@ -4,7 +4,7 @@
 parameters:
   BuildPlatform: 'any cpu'
   BuildConfiguration: 'Release'
-  MsalClientSemVer: '4.60.0-devopsbuild'
+  MicrosoftIdentityClientVersion: '4.60.0-devopsbuild'
 
 steps:
 
@@ -47,7 +47,7 @@ steps:
   displayName: 'Build solution ${{ parameters.Solution }}'
   inputs:
     solution: ${{ parameters.Solution }}
-    msbuildArgs: '/p:RunCodeAnalysis=false /p:MsalClientSemVer=${{ parameters.MsalClientSemVer }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
+    msbuildArgs: '/p:RunCodeAnalysis=false /p:MicrosoftIdentityClientVersion=${{ parameters.MicrosoftIdentityClientVersion }} /p:SourceLinkCreate=true /p:ContinousIntegrationBuild=true'
     platform: ${{ parameters.BuildPlatform }}
     configuration: ${{ parameters.BuildConfiguration }}
     maximumCpuCount: true
diff --git a/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj b/src/client/Microsoft.Identity.Client.Broker/Microsoft.Identity.Client.Broker.csproj
@@ -11,9 +11,9 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>MSAL.NET extension for public client broker support</Title>
     <Description>
diff --git a/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj b/src/client/Microsoft.Identity.Client.Desktop/Microsoft.Identity.Client.Desktop.csproj
@@ -13,10 +13,10 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
-    <MsalClientSemVer>$(MsalClientSemVer)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
+    <MicrosoftIdentityClientVersion>$(MicrosoftIdentityClientVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>MSAL.NET extension for desktop scenarios for older .NET platforms</Title>
     <Description>
diff --git a/src/client/Microsoft.Identity.Client.Extensions.Msal/Microsoft.Identity.Client.Extensions.Msal.csproj b/src/client/Microsoft.Identity.Client.Extensions.Msal/Microsoft.Identity.Client.Extensions.Msal.csproj
@@ -7,9 +7,9 @@
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!-- most of the properties are in Directory.Build.props-->
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
     <Description>This package contains the public client (desktop) caching to Microsoft Authentication Library for .NET (MSAL.NET)</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
diff --git a/src/client/Microsoft.Identity.Client/ApiConfig/BrokerOptions.cs b/src/client/Microsoft.Identity.Client/ApiConfig/BrokerOptions.cs
@@ -79,10 +79,11 @@ internal static BrokerOptions CreateFromWindowsOptions(WindowsBrokerOptions winO
         public bool MsaPassthrough { get; set; } = false;
 
         /// <summary>
-        /// Currently supported on Windows, Linux and macOS
-        /// Allows the Windows broker to list Work and School accounts as part of the <see cref="ClientApplicationBase.GetAccountsAsync()"/>
+        /// Currently supported on Windows, Linux and macOS.
+        /// Allows the Windows broker to list MSA, Work and School accounts as part of the <see cref="ClientApplicationBase.GetAccountsAsync()"/>.
         /// Linux and macOS broker will discover accounts as part of the <see cref="ClientApplicationBase.GetAccountsAsync()"/>
-        /// </summary>        
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public bool ListOperatingSystemAccounts { get; set; }
 
         internal bool IsBrokerEnabledOnCurrentOs()
diff --git a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
@@ -28,9 +28,9 @@
 
   <PropertyGroup Label="NuGet and AssemblyInfo metadata">
     <!--This should be passed from the VSTS build-->
-    <MsalClientSemVer Condition="'$(MsalClientSemVer)' == ''">$(MsalInternalVersion)</MsalClientSemVer>
+    <MicrosoftIdentityClientVersion Condition="'$(MicrosoftIdentityClientVersion)' == ''">$(MsalInternalVersion)</MicrosoftIdentityClientVersion>
     <!--This will generate AssemblyVersion, AssemblyFileVersion and AssemblyInformationVersion-->
-    <Version>$(MsalClientSemVer)</Version>
+    <Version>$(MicrosoftIdentityClientVersion)</Version>
 
     <!-- Copyright needs to be in the form of © not (c) to be compliant -->
     <Title>Microsoft Authentication Library for .NET</Title>
diff --git a/supportPolicy.md b/supportPolicy.md
@@ -7,17 +7,17 @@ The following table lists MSAL.NET versions currently supported and receiving se
 
 | Major Version | Last Release | Patch Release Date  | Support Phase|End of Support |
 | --------------|--------------|--------|------------|--------|
-| 4.x           | [![NuGet](https://img.shields.io/nuget/v/microsoft.identity.client.svg?style=flat-square&label=nuget&colorB=00b200)](https://www.nuget.org/packages/Microsoft.Identity.Client/)   |Monthly| Active | Not planned.<br/>✅Supported versions: from 4.64.1 to [![NuGet](https://img.shields.io/nuget/v/microsoft.identity.client.svg?style=flat-square&label=nuget&colorB=00b200)](https://www.nuget.org/packages/Microsoft.Identity.Client/)<br/>⚠️Unsupported versions `< 4.64.1`.|
+| 4.x           | [![NuGet](https://img.shields.io/nuget/v/microsoft.identity.client.svg?style=flat-square&label=nuget&colorB=00b200)](https://www.nuget.org/packages/Microsoft.Identity.Client/)   |Monthly| Active | Not planned.<br/>✅Supported versions: from 4.61.2 to [![NuGet](https://img.shields.io/nuget/v/microsoft.identity.client.svg?style=flat-square&label=nuget&colorB=00b200)](https://www.nuget.org/packages/Microsoft.Identity.Client/)<br/>⚠️Unsupported versions `< 4.61.2`.|
 
 ## Out of support versions
 The following table lists MSAL.NET versions no longer supported and no longer receiving security fixes.
 
 | Major Version | Latest Patch Version| Patch Release Date | End of Support Date|
 | --------------|--------------|--------|--------|
-| 4.x           | <= 4.64.0      | August 23, 2024        | May 15, 2025    |
-| 3.x           | <= 3.0.9       | July 31, 2019          | May 15, 2025    |
-| 2.x           | <= 2.7.1       | February 21, 2019      | May 15, 2025    |
-| 1.x           | <= 1.1.4-preview0002      | June 1, 2018         | May 15, 2025   |
+| 4.x           |    4.61.1      | August 23, 2024        | May 15, 2025    |
+| 3.x           |    3.0.9       | July 31, 2019          | May 15, 2025    |
+| 2.x           |    2.7.1       | February 21, 2019      | May 15, 2025    |
+| 1.x           |    1.1.4-preview0002      | June 1, 2018         | May 15, 2025   |
 
 ## Overview
 
diff --git a/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/ManagedIdentityTests.NetFwk.cs b/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/ManagedIdentityTests.NetFwk.cs
@@ -62,20 +62,9 @@ public class ManagedIdentityTests
 
         [DataTestMethod]
         [DataRow(MsiAzureResource.WebApp, "", DisplayName = "System_Identity_Web_App")]
-        //[DataRow(MsiAzureResource.Function, "", DisplayName = "System_Identity_Function_App")]
-        //[DataRow(MsiAzureResource.VM, "", DisplayName = "System_Identity_Virtual_Machine")]
         [DataRow(MsiAzureResource.WebApp, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Web_App")]
-        //[DataRow(MsiAzureResource.Function, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Function_App")]
-        //[DataRow(MsiAzureResource.VM, UserAssignedClientID, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Virtual_Machine")]
         [DataRow(MsiAzureResource.WebApp, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Web_App")]
-        //[DataRow(MsiAzureResource.Function, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Function_App")]
-        //[DataRow(MsiAzureResource.VM, UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Virtual_Machine")]
         [DataRow(MsiAzureResource.WebApp, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Web_App")]
-        //[DataRow(MsiAzureResource.Function, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Function_App")]
-        //[DataRow(MsiAzureResource.VM, UserAssignedObjectID, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectID_Virtual_Machine")]
-#if ENABLE_AZURE_ARC_TESTS
-        [DataRow(MsiAzureResource.AzureArc, "", DisplayName = "Azure_ARC")]
-#endif
         public async Task AcquireMSITokenAsync(MsiAzureResource azureResource, string userIdentity, UserAssignedIdentityId userAssignedIdentityId = UserAssignedIdentityId.None)
         {
             //Arrange
@@ -289,12 +278,6 @@ public async Task AcquireMsiToken_ExchangeForEstsToken_Successfully()
         [DataRow(MsiAzureResource.WebApp, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Web_App")]
         [DataRow(MsiAzureResource.WebApp, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_Web_App")]
         [DataRow(MsiAzureResource.WebApp, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Web_App")]
-        //[DataRow(MsiAzureResource.Function, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_Function_App")]
-        //[DataRow(MsiAzureResource.Function, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_Function_App")]
-        //[DataRow(MsiAzureResource.Function, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_Function_App")]
-        //[DataRow(MsiAzureResource.VM, SomeRandomGuid, UserAssignedIdentityId.ClientId, DisplayName = "ClientId_VM")]
-        //[DataRow(MsiAzureResource.VM, SomeRandomGuid, UserAssignedIdentityId.ObjectId, DisplayName = "ObjectId_VM")]
-        //[DataRow(MsiAzureResource.VM, Non_Existent_UamiResourceId, UserAssignedIdentityId.ResourceId, DisplayName = "ResourceID_VM")]
         public async Task ManagedIdentityRequestFailureCheckAsync(MsiAzureResource azureResource, string userIdentity, UserAssignedIdentityId userAssignedIdentityId)
         {
             RunOnHelper.AssertFramework(TargetFrameworks.NetCore);
diff --git a/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/RuntimeBrokerTests.cs b/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/RuntimeBrokerTests.cs
@@ -93,6 +93,7 @@ public async Task WamSilentAuthUserInteractionRequiredAsync()
 
         [DoNotRunOnLinux] // POP is not supported on Linux
         [IgnoreOnOneBranch]
+        [Ignore("Tracking here: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5305")]
         [TestMethod]
         public async Task ExtractNonceWithAuthParserAndValidateShrAsync()
         {
diff --git a/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/WwwAuthenticateParametersIntegrationTests.NetFwk.cs b/tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/WwwAuthenticateParametersIntegrationTests.NetFwk.cs
@@ -101,6 +101,7 @@ private static async Task RunTestForSettingsAsync(string hostName, string apiVer
         }
 
         [RunOn(TargetFrameworks.NetCore)]
+        [Ignore("Tracking here: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5305")]
         public async Task ExtractNonceFromWwwAuthHeadersAsync()
         {
             //Arrange & Act
@@ -125,6 +126,7 @@ public async Task ExtractNonceFromWwwAuthHeadersAsync()
         }
 
         [RunOn(TargetFrameworks.NetCore)]
+        [Ignore("Tracking here: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5305")]
         public async Task ExtractNonceFromAuthInfoHeadersAsync()
         {
             //Arrange & Act
@@ -141,6 +143,7 @@ public async Task ExtractNonceFromAuthInfoHeadersAsync()
         }
 
         [RunOn(TargetFrameworks.NetCore)]
+        [Ignore("Tracking here: https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/5305")]
         public async Task ExtractNonceWithAuthParserAsync()
         {
             //Arrange & Act
diff --git a/tests/devapps/Managed Identity apps/MSIHelperService/Controllers/EnvironmentVariablesController.cs b/tests/devapps/Managed Identity apps/MSIHelperService/Controllers/EnvironmentVariablesController.cs
@@ -55,14 +55,11 @@ public EnvironmentVariablesController(
                 MSIHelper.AzureResource.WebApp => await MSIHelper.GetWebAppEnvironmentVariablesAsync(
                     _logger).ConfigureAwait(false),
 
-                MSIHelper.AzureResource.Function => await MSIHelper.GetFunctionAppEnvironmentVariablesAsync(httpClient,
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.Function => throw new NotImplementedException(),
 
-                MSIHelper.AzureResource.VM => await MSIHelper.GetVirtualMachineEnvironmentVariables(
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.VM => throw new NotImplementedException(),
 
-                MSIHelper.AzureResource.AzureArc => await MSIHelper.GetAzureArcEnvironmentVariables(
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.AzureArc => throw new NotImplementedException(),
 
                 MSIHelper.AzureResource.ServiceFabric => throw new NotImplementedException(),
 
diff --git a/tests/devapps/Managed Identity apps/MSIHelperService/Controllers/MSITokenController.cs b/tests/devapps/Managed Identity apps/MSIHelperService/Controllers/MSITokenController.cs
@@ -63,23 +63,11 @@ public MSITokenController(
                     httpClient,
                     _logger).ConfigureAwait(false),
 
-                MSIHelper.AzureResource.Function => await MSIHelper.GetFunctionAppMSIToken(
-                    identityHeader,
-                    uri,
-                    httpClient,
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.Function => throw new NotImplementedException(),
 
-                MSIHelper.AzureResource.VM => await MSIHelper.GetVirtualMachineMSIToken(
-                    identityHeader, 
-                    uri, 
-                    httpClient,
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.VM => throw new NotImplementedException(),
 
-                MSIHelper.AzureResource.AzureArc => await MSIHelper.GetAzureArcMSIToken(
-                    identityHeader,
-                    uri,
-                    httpClient,
-                    _logger).ConfigureAwait(false),
+                MSIHelper.AzureResource.AzureArc => throw new NotImplementedException(),
 
                 MSIHelper.AzureResource.ServiceFabric => throw new NotImplementedException(),
 
diff --git a/tests/devapps/Managed Identity apps/MSIHelperService/Helper/MSIHelper.cs b/tests/devapps/Managed Identity apps/MSIHelperService/Helper/MSIHelper.cs
diff --git a/tests/devapps/Managed Identity apps/MSIHelperService/RunBookJobStatus.cs b/tests/devapps/Managed Identity apps/MSIHelperService/RunBookJobStatus.cs
diff --git a/tests/devapps/Managed Identity apps/MSIHelperService/WebHookResponse.cs b/tests/devapps/Managed Identity apps/MSIHelperService/WebHookResponse.cs
