Merged PR 716623: Add missing dependency for Microsoft.Identity.Client

The nuget generation logic seems to have a problem with a particular dependency, and even though Microsoft.IdentityModel lists Microsoft.IdentityModel.Abstractions as a dependency, the generated nuget spec does not include the latter for net6 (it does for other frameworks). Patching this manually by including the missing dependency explicitly. We'll file a bug for fixing the root cause.
microsoft · May 5, 2023 · 7b2936f · 7b2936f
1 parent fc72e4c
commit 7b2936f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc b/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
@@ -30,6 +30,8 @@ namespace LauncherServer {
             importFrom("Azure.Identity").pkg,
             importFrom("Azure.Core").pkg,
             importFrom("Microsoft.Identity.Client").pkg,
+            // TODO: this should be part of Microsoft.Identity.Client dependencies, but there seems to be a bug in the spec generation and the dependency is left out.
+            importFrom("Microsoft.IdentityModel.Abstractions").pkg,
 
             ...importFrom("BuildXL.Cache.ContentStore").getGrpcPackages(true),
             ...importFrom("BuildXL.Cache.ContentStore").getGrpcAspNetCorePackages(),

diff --git a/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc b/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc
@@ -32,6 +32,8 @@ namespace Library {
             importFrom("System.Private.ServiceModel").pkg,
             importFrom("System.ServiceModel.Http").pkg,
             importFrom("Microsoft.Identity.Client").pkg,
+            // TODO: this should be part of Microsoft.Identity.Client dependencies, but there seems to be a bug in the spec generation and the dependency is left out.
+            importFrom("Microsoft.IdentityModel.Abstractions").pkg,
 
             importFrom("Azure.Identity").pkg,
             importFrom("Azure.Core").pkg,

diff --git a/Public/Src/Utilities/Authentication/BuildXL.Utilties.Authentication.dsc b/Public/Src/Utilities/Authentication/BuildXL.Utilties.Authentication.dsc
@@ -10,6 +10,8 @@ namespace Authentication {
             Utilities.Core.dll,
             importFrom("Newtonsoft.Json").pkg,
             importFrom("Microsoft.Identity.Client").pkg,
+            // TODO: this should be part of Microsoft.Identity.Client dependencies, but there seems to be a bug in the spec generation and the dependency is left out.
+            importFrom("Microsoft.IdentityModel.Abstractions").pkg,
             importFrom("Microsoft.Identity.Client.Extensions.Msal").pkg,
             importFrom("Microsoft.IdentityModel.Clients.ActiveDirectory").pkg,
             importFrom("Microsoft.VisualStudio.Services.Client").pkg,