Merge branch 'feature/mgmt-track2' of https://github.com/Azure/azure-…

…sdk-for-net into mgmt-track2
AME-Redmond · Jun 23, 2021 · 3786863 · 3786863
2 parents 26e907c + 60d9525
commit 3786863
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs b/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Azure.ResourceManager.TestFramework
@@ -32,12 +33,24 @@ protected ManagementRecordedTestBase(bool isAsync) : base(isAsync)
         {
             SessionEnvironment = new TEnvironment();
             SessionEnvironment.Mode = Mode;
+            Initialize();
         }
 
         protected ManagementRecordedTestBase(bool isAsync, RecordedTestMode mode) : base(isAsync, mode)
         {
             SessionEnvironment = new TEnvironment();
             SessionEnvironment.Mode = Mode;
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            if (Mode == RecordedTestMode.Playback)
+            {
+                var opInternalType = typeof(OperationInternals);
+                var pollField = opInternalType.GetField("<DefaultPollingInterval>k__BackingField", BindingFlags.Static | BindingFlags.NonPublic);
+                pollField.SetValue(null, TimeSpan.Zero);
+            }
         }
 
         private ArmClient GetCleanupClient()

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -137,7 +137,7 @@
     All should have PrivateAssets="All" set so they don't become pacakge dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210621.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20210622.3" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20210601.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1" PrivateAssets="All" />

diff --git a/sdk/resourcemanager/ci.yml b/sdk/resourcemanager/ci.yml
@@ -20,6 +20,8 @@ pr:
   paths:
     include:
     - sdk/resourcemanager/
+    - common/ManagementTestShared/
+    - common/ManagementCoreShared/
 
 extends:
   template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml