Merge 4.9 back to master (#4032)

* Do NOT call TeamsInfo.getMember for the bot (#3923)

* Do NOT call TeamsInfo.getMember for the bot

* Add TestConversationUpdateBotTeamsMemberAdded

* Declarative: disable cycle detection to reduce release risk

* Update Nuget.Client to resolve circular reference exceptions (#3964)

* Fixes BadRequest message in Teams (#3966)

* Added check to ensure we don't send EoC when a skill is done and we are at the root bot.
Updated tests to handle this case and removed duplicated test after refactoring.
Fixed some typos and trace message names.

* Auth: Tighten JWT validation of channel-issued tokens with certificate signature (#3978)

* Auth: Tighten JWT validation of channel issued tokens with certificate signature

* Fix comment in test

* Auth improvements: add test category and adjust linux build settings

* Auth tests: cleanup self-signed certs after tests

* Change filter to "TestCategory". (#3986)

* Don't throw exception on unhandled VersionChangeDetected event (#4000)

* disable throwing exception if dialog change not handled

* remove trace from versionChanged

Co-authored-by: Eric Dahlvang <v-eridah@microsoft.com>
Co-authored-by: Carlos Castro <ccastro@microsoft.com>
Co-authored-by: Monica Rivera <44449640+mrivera-ms@users.noreply.github.com>
Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
Co-authored-by: Carlos Castro <carlosscastro@users.noreply.github.com>
Co-authored-by: BruceHaley <v-bruhal@microsoft.com>

Author: 6 people

libraries/Microsoft.Bot.Builder.Dialogs.Declarative/Resources/ResourceExplorer.cs

@@ -506,15 +506,6 @@ private T Load<T>(JToken token, SourceContext sourceContext)
                 }
             }
 
-            // Create a cycle detection observer
-            var cycleDetector = new CycleDetectionObserver();
-
-            // Register our cycle detector on the converters that support observer registration
-            foreach (var observableConverter in converters.Where(c => c is IObservableConverter))
-            {
-                (observableConverter as IObservableConverter).RegisterObserver(cycleDetector);
-            }
-
             var serializer = JsonSerializer.Create(new JsonSerializerSettings()
             {
                 TypeNameHandling = TypeNameHandling.Auto,
@@ -530,13 +521,6 @@ private T Load<T>(JToken token, SourceContext sourceContext)
                 }
             });
 
-            // Pass 1 of cycle detection. This pass fills the cycle detector cache excluding cycles.
-            var pass1Result = token.ToObject<T>(serializer);
-
-            cycleDetector.CycleDetectionPass = CycleDetectionPasses.PassTwo;
-
-            // Pass 2 of cycle detection. This pass stitches objects from the cache into the places
-            // where we found cycles.
             return token.ToObject<T>(serializer);
         }
 

tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/ActionTests.cs

@@ -250,6 +250,7 @@ public async Task Action_ReplaceDialog()
         }
 
         [TestMethod]
+        [Ignore]
         public async Task Action_ReplaceDialogRecursive()
         {
             await TestUtils.RunTestScript(ResourceExplorer);

tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/JsonLoadTests.cs

@@ -48,6 +48,7 @@ await BuildTestFlow(@"DoubleReference.dialog")
         }
 
         [TestMethod]
+        [Ignore]
         public async Task JsonDialogLoad_CycleDetection()
         {
             await BuildTestFlow(@"Root.dialog")