Merge pull request #3098 from microsoftgraph/2997-msgraph-and-az-module-are-not-compatible

timayabi2020 · web-flow · commit 6aadaf08832b · 2025-02-04T13:07:51.000+03:00
Bumps versions for Azure.Identity, Azure.Identity.Broker and Microsoft.Graph.Core
diff --git a/.azure-pipelines/common-templates/install-tools.yml b/.azure-pipelines/common-templates/install-tools.yml
@@ -5,9 +5,8 @@ steps:
   - task: UseDotNet@2
     displayName: Use .NET SDK
     inputs:
-      debugMode: false
-      version: 8.x
-
+      version: 8.x     
+      
   - task: NuGetToolInstaller@1
     displayName: Install Nuget
 
diff --git a/src/Authentication/Authentication.Core/Microsoft.Graph.Authentication.Core.csproj b/src/Authentication/Authentication.Core/Microsoft.Graph.Authentication.Core.csproj
@@ -2,18 +2,20 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\..\Repo.props" />
   <PropertyGroup>
     <LangVersion>9.0</LangVersion>
-    <TargetFrameworks>netstandard2.0;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net472</TargetFrameworks>
     <RootNamespace>Microsoft.Graph.PowerShell.Authentication.Core</RootNamespace>
-    <Version>2.18.0</Version>
+    <Version>2.25.0</Version>
+    <!-- Suppress .NET Target Framework Moniker (TFM) Support Build Warnings -->
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
   </PropertyGroup>
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.11.4" />
-    <PackageReference Include="Azure.Identity.Broker" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Graph.Core" Version="3.1.13" />
+    <PackageReference Include="Azure.Identity" Version="1.13.2" />
+    <PackageReference Include="Azure.Identity.Broker" Version="1.2.0" />
+    <PackageReference Include="Microsoft.Graph.Core" Version="3.2.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
diff --git a/src/Authentication/Authentication.Core/Utilities/AuthenticationHelpers.cs b/src/Authentication/Authentication.Core/Utilities/AuthenticationHelpers.cs
@@ -60,7 +60,8 @@ private static async Task<TokenCredential> GetEnvironmentCredentialAsync(IAuthCo
         {
             if (authContext is null)
                 throw new AuthenticationException(ErrorConstants.Message.MissingAuthContext);
-
+            //There is need for explicitly adding TenantId to the TokenCredentialOptions for EnvironmentCredential due to stricter security requirements.
+            authContext.TenantId = EnvironmentVariables.TenantId;
             var tokenCredentialOptions = new TokenCredentialOptions
             {
                 AuthorityHost = new Uri(GetAuthorityUrl(authContext))
@@ -207,8 +208,8 @@ public static async Task<AzureIdentityAccessTokenProvider> GetAuthenticationProv
         {
             if (authContext is null)
                 throw new AuthenticationException(ErrorConstants.Message.MissingAuthContext);
-            var tokenCrdential = await GetTokenCredentialAsync(authContext, default).ConfigureAwait(false);
-            return new AzureIdentityAccessTokenProvider(credential: tokenCrdential, scopes: GetScopes(authContext));
+            var tokenCredential = await GetTokenCredentialAsync(authContext, default).ConfigureAwait(false);
+            return new AzureIdentityAccessTokenProvider(credential:tokenCredential, observabilityOptions: null,isCaeEnabled: true,scopes: GetScopes(authContext));
         }
 
         public static async Task<IAuthContext> AuthenticateAsync(IAuthContext authContext, CancellationToken cancellationToken)
diff --git a/src/Authentication/Authentication.Test/Microsoft.Graph.Authentication.Test.csproj b/src/Authentication/Authentication.Test/Microsoft.Graph.Authentication.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <Version>2.8.0</Version>
+    <Version>2.25.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <!-- As described in this post https://devblogs.microsoft.com/powershell/depending-on-the-right-powershell-nuget-package-in-your-net-project, reference the SDK for dotnetcore-->
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.4.3" PrivateAssets="all" Condition="'$(TargetFramework)' == 'net6.0'" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.0" PrivateAssets="all" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
diff --git a/src/Authentication/Authentication/Helpers/HttpHelpers.cs b/src/Authentication/Authentication/Helpers/HttpHelpers.cs
@@ -54,7 +54,6 @@ private static HttpClient GetGraphHttpClient(AzureIdentityAccessTokenProvider au
                 new NationalCloudHandler(),
                 new ODataQueryOptionsHandler(),
                 new HttpVersionHandler(),
-                new CompressionHandler(),
                 new RetryHandler(new RetryHandlerOption{
                     Delay = requestContext.RetryDelay,
                     MaxRetry = requestContext.MaxRetry,
@@ -69,7 +68,7 @@ private static HttpClient GetGraphHttpClient(AzureIdentityAccessTokenProvider au
                 : GraphClientFactory.Create(delegatingHandlers, finalHandler: new HttpClientHandler
                 {
                     AllowAutoRedirect = false,
-                    AutomaticDecompression = DecompressionMethods.None
+                    AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
                 });
             httpClient.Timeout = requestContext.ClientTimeout;
             return httpClient;
diff --git a/src/Authentication/Authentication/build-module.ps1 b/src/Authentication/Authentication/build-module.ps1
@@ -8,7 +8,7 @@ $ErrorActionPreference = 'Stop'
 $ModuleName = "Authentication"
 $ModulePrefix = "Microsoft.Graph"
 $netStandard = "netstandard2.0"
-$netApp = "net6.0"
+$netApp = "net8.0"
 $netFx = "net472"
 $copyExtensions = @('.dll', '.pdb')
 
diff --git a/src/Authentication/Authentication/test/Connect-MgGraph.Tests.ps1 b/src/Authentication/Authentication/test/Connect-MgGraph.Tests.ps1
@@ -7,11 +7,7 @@ BeforeAll {
     $ModulePath = Join-Path $PSScriptRoot "..\artifacts\$ModuleName.psd1"
     Import-Module $ModulePath -Force
     $RandomClientId = (New-Guid).Guid
-    
-    $AvailableAzModule = Get-Module Az.Accounts -ListAvailable
-    if ($AvailableAzModule.Count -lt 1) {
-        Install-Module Az.Accounts -Repository PSGallery -Scope CurrentUser -Force -AllowClobber
-    }
+    Install-Module Az.Accounts -Repository PSGallery -Scope CurrentUser -Force -AllowClobber
 }
 Describe 'Connect-MgGraph ParameterSets' {
     BeforeAll {
@@ -81,7 +77,7 @@ Describe 'Connect-MgGraph In Environment Variable Mode' {
             $Env:AZURE_CLIENT_SECRET = "Not_Valid"
             $Env:AZURE_TENANT_ID = "common"
             Connect-MgGraph -EnvironmentVariable -ErrorAction Stop
-        } | Should -Throw -ExpectedMessage "*ClientSecretCredential authentication failed: AADSTS700016: Application with identifier 'Not_Valid' was not found in the directory 'Microsoft'.*"
+        } | Should -Throw -ExpectedMessage "ClientSecretCredential authentication failed: "
     }
 }
 
@@ -99,7 +95,7 @@ Describe 'Connect-MgGraph In App Mode' {
 Describe 'Connect-MgGraph Dependency Resolution' {
     It 'Should load Mg module side by side with Az module.' {
         { Connect-AzAccount -ApplicationId $RandomClientId -CertificateThumbprint "Invalid" -Tenant "Invalid" -ErrorAction Stop } | Should -Throw -ExpectedMessage "*Could not find tenant id*"
-        { Connect-MgGraph -TenantId "thisdomaindoesnotexist.com" -ErrorAction Stop -UseDeviceAuthentication } | Should -Throw -ExpectedMessage "*AADSTS90002*"
+        { Connect-MgGraph -TenantId "thisdomaindoesnotexist.com" -ErrorAction Stop -UseDeviceAuthentication } | Should -Throw -ExpectedMessage "DeviceCodeCredential authentication failed: "
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ private static async Task<TokenCredential> GetEnvironmentCredentialAsync(IAuthCo`
`60`	`60`	`{`
`61`	`61`	`if (authContext is null)`
`62`	`62`	`throw new AuthenticationException(ErrorConstants.Message.MissingAuthContext);`
`63`		`-`
	`63`	`+ //There is need for explicitly adding TenantId to the TokenCredentialOptions for EnvironmentCredential due to stricter security requirements.`
	`64`	`+ authContext.TenantId = EnvironmentVariables.TenantId;`
`64`	`65`	`var tokenCredentialOptions = new TokenCredentialOptions`
`65`	`66`	`{`
`66`	`67`	`AuthorityHost = new Uri(GetAuthorityUrl(authContext))`
`@@ -207,8 +208,8 @@ public static async Task<AzureIdentityAccessTokenProvider> GetAuthenticationProv`
`207`	`208`	`{`
`208`	`209`	`if (authContext is null)`
`209`	`210`	`throw new AuthenticationException(ErrorConstants.Message.MissingAuthContext);`
`210`		`- var tokenCrdential = await GetTokenCredentialAsync(authContext, default).ConfigureAwait(false);`
`211`		`- return new AzureIdentityAccessTokenProvider(credential: tokenCrdential, scopes: GetScopes(authContext));`
	`211`	`+ var tokenCredential = await GetTokenCredentialAsync(authContext, default).ConfigureAwait(false);`
	`212`	`+ return new AzureIdentityAccessTokenProvider(credential:tokenCredential, observabilityOptions: null,isCaeEnabled: true,scopes: GetScopes(authContext));`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`public static async Task<IAuthContext> AuthenticateAsync(IAuthContext authContext, CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,7 @@ BeforeAll {`
`7`	`7`	`$ModulePath = Join-Path $PSScriptRoot "..\artifacts\$ModuleName.psd1"`
`8`	`8`	`Import-Module $ModulePath -Force`
`9`	`9`	`$RandomClientId = (New-Guid).Guid`
`10`		`-`
`11`		`- $AvailableAzModule = Get-Module Az.Accounts -ListAvailable`
`12`		`- if ($AvailableAzModule.Count -lt 1) {`
`13`		`- Install-Module Az.Accounts -Repository PSGallery -Scope CurrentUser -Force -AllowClobber`
`14`		`- }`
	`10`	`+ Install-Module Az.Accounts -Repository PSGallery -Scope CurrentUser -Force -AllowClobber`
`15`	`11`	`}`
`16`	`12`	`Describe 'Connect-MgGraph ParameterSets' {`
`17`	`13`	`BeforeAll {`
`@@ -81,7 +77,7 @@ Describe 'Connect-MgGraph In Environment Variable Mode' {`
`81`	`77`	`$Env:AZURE_CLIENT_SECRET = "Not_Valid"`
`82`	`78`	`$Env:AZURE_TENANT_ID = "common"`
`83`	`79`	`Connect-MgGraph -EnvironmentVariable -ErrorAction Stop`
`84`		`- } \| Should -Throw -ExpectedMessage "ClientSecretCredential authentication failed: AADSTS700016: Application with identifier 'Not_Valid' was not found in the directory 'Microsoft'."`
	`80`	`+ } \| Should -Throw -ExpectedMessage "ClientSecretCredential authentication failed: "`
`85`	`81`	`}`
`86`	`82`	`}`
`87`	`83`
`@@ -99,7 +95,7 @@ Describe 'Connect-MgGraph In App Mode' {`
`99`	`95`	`Describe 'Connect-MgGraph Dependency Resolution' {`
`100`	`96`	`It 'Should load Mg module side by side with Az module.' {`
`101`	`97`	`{ Connect-AzAccount -ApplicationId $RandomClientId -CertificateThumbprint "Invalid" -Tenant "Invalid" -ErrorAction Stop } \| Should -Throw -ExpectedMessage "Could not find tenant id"`
`102`		`- { Connect-MgGraph -TenantId "thisdomaindoesnotexist.com" -ErrorAction Stop -UseDeviceAuthentication } \| Should -Throw -ExpectedMessage "AADSTS90002"`
	`98`	`+ { Connect-MgGraph -TenantId "thisdomaindoesnotexist.com" -ErrorAction Stop -UseDeviceAuthentication } \| Should -Throw -ExpectedMessage "DeviceCodeCredential authentication failed: "`
`103`	`99`	`}`
`104`	`100`	`}`
`105`	`101`