Update to MSAL 4.36 and add deterministic builds. (#150)

* Update to MSAL 4.36 and add deterministic builds. * Minor fix to test app.
AzureAD · Aug 31, 2021 · db4e08f · db4e08f
1 parent f8620fc
commit db4e08f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,6 +19,12 @@
 
 
   </PropertyGroup>
+
+  <ItemGroup Label="For ContinuousIntegrationBuild support">
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
+    <!-- defines repository top level dir-->
+  </ItemGroup>
+
   <ItemGroup Label="Dev Dependencies">
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.9.60" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />

diff --git a/sample/ManualTestApp/ManualTestApp.csproj b/sample/ManualTestApp/ManualTestApp.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.35.1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.36.0" />
     <!-- <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.16.8" /> -->
 
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />

diff --git a/sample/ManualTestApp/Program.cs b/sample/ManualTestApp/Program.cs
@@ -45,7 +45,6 @@ static async Task Main(string[] args)
 
             while (true)
             {
-
                 // Display menu
                 Console.WriteLine($@"
                         1. Acquire Token using Username and Password - for TEST only, do not use in production!
@@ -59,7 +58,7 @@ 7. Use persistence layer to read / write any data
                         c. Clear cache
                         e. Expire Access Tokens (TEST only!)
                         x. Exit app
-                    Enter your Selection: ");
+                    Enter your selection: ");
                 char.TryParse(Console.ReadLine(), out var selection);
                 try
                 {
@@ -163,7 +162,7 @@ await Task.WhenAll(
                             byte[] secretBytes = Encoding.UTF8.GetBytes("secret");
                             Console.WriteLine("Writing...");
                             storage.WriteData(secretBytes);
-                            
+
                             Console.WriteLine("Writing again...");
                             storage.WriteData(secretBytes);
 
@@ -175,7 +174,7 @@ await Task.WhenAll(
                             Console.WriteLine("Deleting...");
                             storage.Clear();
 
-                            
+
                             break;
 
 
@@ -189,7 +188,7 @@ await Task.WhenAll(
                            Config.KeyChainAccountName);
 
                             storage = Storage.Create(storageProperties.Build());
-                            
+
                             string lockFilePath = Path.Combine(Config.CacheDir, Config.CacheFileName + ".lockfile");
 
                             using (new CrossPlatLock(lockFilePath)) // cross-process only
@@ -239,7 +238,7 @@ await Task.WhenAll(
                                 .Single(p => p.Name == "Microsoft.Identity.Client.ITokenCacheInternal.Accessor")
                                 .GetValue(pca.UserTokenCache);
 
-                            var internalAccessTokens = accessor.GetType().GetMethod("GetAllAccessTokens").Invoke(accessor, null) as IEnumerable<object>;
+                            var internalAccessTokens = accessor.GetType().GetMethod("GetAllAccessTokens").Invoke(accessor, new object[] { null }) as IEnumerable<object>;
 
                             foreach (var internalAt in internalAccessTokens)
                             {
@@ -249,7 +248,7 @@ await Task.WhenAll(
 
                             var ctor = typeof(TokenCacheNotificationArgs).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).Single();
 
-                            var notificationArgs = ctor.Invoke(new object[] { pca.UserTokenCache, Config.ClientId, null, true, false, true, null });
+                            var notificationArgs = ctor.Invoke(new object[] { pca.UserTokenCache, Config.ClientId, null, true, false, true, null, null, null });
                             var task = pca.UserTokenCache.GetType().GetRuntimeMethods()
                                 .Single(m => m.Name == "Microsoft.Identity.Client.ITokenCacheInternal.OnAfterAccessAsync")
                                 .Invoke(pca.UserTokenCache, new[] { notificationArgs });

diff --git a/...icrosoft.Identity.Client.Extensions.Adal/Microsoft.Identity.Client.Extensions.Adal.csproj b/...icrosoft.Identity.Client.Extensions.Adal/Microsoft.Identity.Client.Extensions.Adal.csproj
@@ -30,6 +30,10 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
 
+  <PropertyGroup Label="For CI build" Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
   </ItemGroup>

diff --git a/...icrosoft.Identity.Client.Extensions.Msal/Microsoft.Identity.Client.Extensions.Msal.csproj b/...icrosoft.Identity.Client.Extensions.Msal/Microsoft.Identity.Client.Extensions.Msal.csproj
@@ -28,11 +28,15 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
+
+  <PropertyGroup Label="For CI build" Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
 
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.35.1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.36.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkNetDesktop)'">

diff --git a/...ient.Extensions.Msal.UnitTests/Microsoft.Identity.Client.Extensions.Msal.UnitTests.csproj b/...ient.Extensions.Msal.UnitTests/Microsoft.Identity.Client.Extensions.Msal.UnitTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.35.1" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.36.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />