Azure · ArcturusZhang · Jun 8, 2021
diff --git a/samples/AppConfiguration/AppConfiguration.csproj b/samples/AppConfiguration/AppConfiguration.csproj
diff --git a/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj b/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj
diff --git a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj
diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage.csproj b/samples/Azure.Management.Storage/Azure.Management.Storage.csproj
diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj
diff --git a/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj b/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj
diff --git a/samples/Azure.ResourceManager.Sample/Generated/Extensions/SubscriptionExtensions.cs b/samples/Azure.ResourceManager.Sample/Generated/Extensions/SubscriptionExtensions.cs
@@ -31,7 +31,7 @@ private static AvailabilitySetsRestOperations GetAvailabilitySetsRestOperations(
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<AvailabilitySet> ListAvailabilitySetAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetAvailabilitySetsRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
@@ -180,7 +180,7 @@ private static ProximityPlacementGroupsRestOperations GetProximityPlacementGroup
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<ProximityPlacementGroup> ListProximityPlacementGroupAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetProximityPlacementGroupsRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
@@ -327,7 +327,7 @@ private static DedicatedHostGroupsRestOperations GetDedicatedHostGroupsRestOpera
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<DedicatedHostGroup> ListDedicatedHostGroupAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetDedicatedHostGroupsRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
@@ -474,7 +474,7 @@ private static SshPublicKeysRestOperations GetSshPublicKeysRestOperations(Client
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<SshPublicKey> ListSshPublicKeyAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetSshPublicKeysRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
@@ -621,7 +621,7 @@ private static VirtualMachinesRestOperations GetVirtualMachinesRestOperations(Cl
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<VirtualMachine> ListVirtualMachineAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetVirtualMachinesRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
@@ -770,7 +770,7 @@ private static VirtualMachineScaleSetsRestOperations GetVirtualMachineScaleSetsR
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<VirtualMachineScaleSet> ListVirtualMachineScaleSetAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetVirtualMachineScaleSetsRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);

diff --git a/samples/Azure.Storage.Tables/Azure.Storage.Tables.csproj b/samples/Azure.Storage.Tables/Azure.Storage.Tables.csproj
diff --git a/samples/CognitiveSearch/CognitiveSearch.csproj b/samples/CognitiveSearch/CognitiveSearch.csproj
diff --git a/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj b/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj
diff --git a/src/AutoRest.CSharp/AutoRest.CSharp.csproj b/src/AutoRest.CSharp/AutoRest.CSharp.csproj
@@ -15,9 +15,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.14.0" />
+    <PackageReference Include="Azure.Core" Version="1.15.0" />
     <PackageReference Include="Azure.Core.Experimental" Version="0.1.0-preview.12" />
-    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210526.3" />
+    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210608.3" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0-1.final" />
     <PackageReference Include="YamlDotNet" Version="8.1.2" />
   </ItemGroup>

diff --git a/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs b/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs
@@ -25,7 +25,7 @@ internal class CSharpProj : IPlugin
   </PropertyGroup>
 {0}
   <ItemGroup>
-    <PackageReference Include=""Azure.Core"" Version=""1.14.0"" />
+    <PackageReference Include=""Azure.Core"" Version=""1.15.0"" />
   </ItemGroup>
 
 </Project>
@@ -37,7 +37,7 @@ internal class CSharpProj : IPlugin
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include=""Azure.ResourceManager.Core"" Version=""1.0.0-alpha.20210526.3"" />
+    <PackageReference Include=""Azure.ResourceManager.Core"" Version=""1.0.0-alpha.20210608.3"" />
   </ItemGroup>
 ";
 

diff --git a/src/AutoRest.CSharp/Mgmt/Generation/SubscriptionExtensionsWriter.cs b/src/AutoRest.CSharp/Mgmt/Generation/SubscriptionExtensionsWriter.cs
@@ -171,7 +171,7 @@ private void WriteListResourceMethod(CodeWriter writer, Resource resource, Resou
             var methodName = $"List{resource.Type.Name}";
             using (writer.Scope($"public static {responseType} {CreateMethodName(methodName, async)}(this {typeof(SubscriptionOperations)} subscription, {typeof(CancellationToken)} cancellationToken = default)"))
             {
-                writer.Append($"return subscription.ListResources((baseUri, credential, options, pipeline) =>");
+                writer.Append($"return subscription.{CreateMethodName("ListResources", async)}((baseUri, credential, options, pipeline) =>");
                 using (writer.Scope())
                 {
                     var clientDiagnostics = new CodeWriterDeclaration("clientDiagnostics");

diff --git a/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj b/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.14.0" />
+    <PackageReference Include="Azure.Core" Version="1.15.0" />
 
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210526.3" />
+    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210608.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.14" />
+    <PackageReference Include="Azure.Core" Version="1.15.0" />
     <PackageReference Include="Azure.Core.Experimental" Version="0.1.0-preview.12" />
     <PackageReference Include="Azure.Identity" Version="1.0.0" />
-    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210526.3" />
+    <PackageReference Include="Azure.ResourceManager.Core" Version="1.0.0-alpha.20210608.3" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />

diff --git a/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj b/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" Version="1.14.0" />
+    <PackageReference Include="Azure.Core" Version="1.15.0" />
     <PackageReference Include="Azure.Core.Experimental" Version="0.1.0-preview.12" />
     <PackageReference Include="Azure.Identity" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />

diff --git a/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj b/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj
diff --git a/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj b/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj
diff --git a/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj b/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj
diff --git a/test/TestProjects/Accessibility/Accessibility.csproj b/test/TestProjects/Accessibility/Accessibility.csproj
diff --git a/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj b/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj
diff --git a/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj b/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj
diff --git a/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj b/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj
diff --git a/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj b/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj
diff --git a/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj b/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj
diff --git a/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj b/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj
diff --git a/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj b/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj
diff --git a/test/TestProjects/Inheritance/Inheritance.csproj b/test/TestProjects/Inheritance/Inheritance.csproj
diff --git a/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj b/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj
diff --git a/test/TestProjects/MgmtOperations/MgmtOperations.csproj b/test/TestProjects/MgmtOperations/MgmtOperations.csproj
diff --git a/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs b/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs
@@ -31,7 +31,7 @@ private static AvailabilitySetsRestOperations GetAvailabilitySetsRestOperations(
         /// <return> A collection of resource operations that may take multiple service requests to iterate over. </return>
         public static AsyncPageable<AvailabilitySet> ListAvailabilitySetAsync(this SubscriptionOperations subscription, CancellationToken cancellationToken = default)
         {
-            return subscription.ListResources((baseUri, credential, options, pipeline) =>
+            return subscription.ListResourcesAsync((baseUri, credential, options, pipeline) =>
             {
                 var clientDiagnostics = new ClientDiagnostics(options);
                 var restOperations = GetAvailabilitySetsRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);

diff --git a/test/TestProjects/MgmtParent/MgmtParent.csproj b/test/TestProjects/MgmtParent/MgmtParent.csproj
diff --git a/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj b/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj