add EnableCacheSynchronization (#1344)

* add EnableCacheSynchronization * update .net 5.0.* * fix
AzureAD · Jul 26, 2021 · cea68be · cea68be
1 parent bb7997b
commit cea68be
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/build/template-install-dotnet-core.yaml b/build/template-install-dotnet-core.yaml
@@ -5,7 +5,7 @@ steps:
 - task: UseDotNet@2
   displayName: 'Use .Net Core SDK 5'
   inputs:
-    version: 5.0.100
+    version: 5.0.x
 - task: UseDotNet@2
   displayName: 'Use .Net Core SDK 3.1.404'
   inputs:

diff --git a/src/Microsoft.Identity.Web/MergedOptions.cs b/src/Microsoft.Identity.Web/MergedOptions.cs
@@ -43,6 +43,7 @@ public ConfidentialClientApplicationOptions ConfidentialClientApplicationOptions
         public bool IsDefaultPlatformLoggingEnabled { get; set; }
         public LogLevel LogLevel { get; set; }
         public string? RedirectUri { get; set; }
+        public bool EnableCacheSynchronization { get; set; }
 
         internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftIdentityOptions microsoftIdentityOptions, MergedOptions mergedOptions)
         {
@@ -287,6 +288,7 @@ internal static void UpdateMergedOptionsFromConfidentialClientApplicationOptions
 
             mergedOptions.IsDefaultPlatformLoggingEnabled = confidentialClientApplicationOptions.IsDefaultPlatformLoggingEnabled;
             // mergedOptions.LegacyCacheCompatibilityEnabled = confidentialClientApplicationOptions.LegacyCacheCompatibilityEnabled; // must be set through id web options
+            mergedOptions.EnableCacheSynchronization = confidentialClientApplicationOptions.EnableCacheSynchronization;
             mergedOptions.LogLevel = confidentialClientApplicationOptions.LogLevel;
             if (string.IsNullOrEmpty(mergedOptions.RedirectUri) && !string.IsNullOrEmpty(confidentialClientApplicationOptions.RedirectUri))
             {
@@ -339,6 +341,7 @@ internal static void UpdateConfidentialClientApplicationOptionsFromMergedOptions
 
             confidentialClientApplicationOptions.IsDefaultPlatformLoggingEnabled = mergedOptions.IsDefaultPlatformLoggingEnabled;
             confidentialClientApplicationOptions.LegacyCacheCompatibilityEnabled = mergedOptions.LegacyCacheCompatibilityEnabled;
+            confidentialClientApplicationOptions.EnableCacheSynchronization = mergedOptions.EnableCacheSynchronization;
             confidentialClientApplicationOptions.LogLevel = mergedOptions.LogLevel;
             if (string.IsNullOrEmpty(confidentialClientApplicationOptions.RedirectUri) && !string.IsNullOrEmpty(mergedOptions.RedirectUri))
             {

diff --git a/tests/WebAppCallsMicrosoftGraph/appsettings.json b/tests/WebAppCallsMicrosoftGraph/appsettings.json
@@ -8,6 +8,7 @@
         "ClientSecret": "secret-goes-here",
         //"EnablePiiLogging": true,
         "CallbackPath": "/signin-oidc"
+        "EnableCacheSynchronization":  "false"
     },
 
     "GraphBeta": {