diff --git a/samples/AppConfiguration/AppConfiguration.csproj b/samples/AppConfiguration/AppConfiguration.csproj
index 4d853594271..9adcb9bb822 100644
--- a/samples/AppConfiguration/AppConfiguration.csproj
+++ b/samples/AppConfiguration/AppConfiguration.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj b/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj
+++ b/samples/Azure.AI.DocumentTranslation/Azure.AI.DocumentTranslation.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj
index 4d853594271..9adcb9bb822 100644
--- a/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj
+++ b/samples/Azure.AI.FormRecognizer/Azure.AI.FormRecognizer.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/Azure.Management.Storage/Azure.Management.Storage.csproj b/samples/Azure.Management.Storage/Azure.Management.Storage.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/samples/Azure.Management.Storage/Azure.Management.Storage.csproj
+++ b/samples/Azure.Management.Storage/Azure.Management.Storage.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj
index 4d853594271..9adcb9bb822 100644
--- a/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj
+++ b/samples/Azure.Network.Management.Interface/Azure.Network.Management.Interface.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj b/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj
+++ b/samples/Azure.ResourceManager.Sample/Azure.ResourceManager.Sample.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/samples/Azure.ResourceManager.Sample/Generated/Extensions/SubscriptionExtensions.cs b/samples/Azure.ResourceManager.Sample/Generated/Extensions/SubscriptionExtensions.cs
index bfc1a8228bc..387fc450e52 100644
--- 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(
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
index 4d853594271..9adcb9bb822 100644
--- a/samples/Azure.Storage.Tables/Azure.Storage.Tables.csproj
+++ b/samples/Azure.Storage.Tables/Azure.Storage.Tables.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/CognitiveSearch/CognitiveSearch.csproj b/samples/CognitiveSearch/CognitiveSearch.csproj
index 4d853594271..9adcb9bb822 100644
--- a/samples/CognitiveSearch/CognitiveSearch.csproj
+++ b/samples/CognitiveSearch/CognitiveSearch.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj b/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj
index 4d853594271..9adcb9bb822 100644
--- a/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj
+++ b/samples/CognitiveServices.TextAnalytics/CognitiveServices.TextAnalytics.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/src/AutoRest.CSharp/AutoRest.CSharp.csproj b/src/AutoRest.CSharp/AutoRest.CSharp.csproj
index 335e1eeef52..9854241739f 100644
--- a/src/AutoRest.CSharp/AutoRest.CSharp.csproj
+++ b/src/AutoRest.CSharp/AutoRest.CSharp.csproj
@@ -15,9 +15,9 @@
-
+
-
+
diff --git a/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs b/src/AutoRest.CSharp/Common/AutoRest/Plugins/CSharpProj.cs
index c4d99666f3f..6b481d009f9 100644
--- 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
{0}
-
+
@@ -37,7 +37,7 @@ internal class CSharpProj : IPlugin
-
+
";
diff --git a/src/AutoRest.CSharp/Mgmt/Generation/SubscriptionExtensionsWriter.cs b/src/AutoRest.CSharp/Mgmt/Generation/SubscriptionExtensionsWriter.cs
index 731d3d93d25..3c8a20e5915 100644
--- 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
index d7d7cbb5373..3cdcafc13e6 100644
--- a/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj
+++ b/test/AutoRest.Shared.Tests/AutoRest.Shared.Tests.csproj
@@ -7,12 +7,12 @@
-
+
-
+
diff --git a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
index 2ac241039dd..c81f5c199b2 100644
--- a/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
+++ b/test/AutoRest.TestServer.Tests/AutoRest.TestServer.Tests.csproj
@@ -8,10 +8,10 @@
-
+
-
+
diff --git a/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj b/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj
index 773e5281407..4191db15a26 100644
--- a/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj
+++ b/test/AutoRest.TestServerLowLevel.Tests/AutoRest.TestServerLowLevel.Tests.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj b/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj
+++ b/test/TestProjects/Accessibility-LowLevel-NoAuth/Accessibility_LowLevel_NoAuth.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj b/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj
+++ b/test/TestProjects/Accessibility-LowLevel-TokenAuth/Accessibility_LowLevel_TokenAuth.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj b/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj
+++ b/test/TestProjects/Accessibility-LowLevel/Accessibility_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestProjects/Accessibility/Accessibility.csproj b/test/TestProjects/Accessibility/Accessibility.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/Accessibility/Accessibility.csproj
+++ b/test/TestProjects/Accessibility/Accessibility.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj b/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj
+++ b/test/TestProjects/AdditionalPropertiesEx/AdditionalPropertiesEx.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj b/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj
+++ b/test/TestProjects/BodyAndPath-LowLevel/BodyAndPath_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj b/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj
+++ b/test/TestProjects/ExactMatchInheritance/ExactMatchInheritance.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj b/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj
+++ b/test/TestProjects/ExtensionClientName/ExtensionClientName.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj b/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj
+++ b/test/TestProjects/FlattenedParameters/FlattenedParameters.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj b/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj
+++ b/test/TestProjects/HeadAsBooleanTrue/HeadAsBooleanTrue.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj b/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj
+++ b/test/TestProjects/HeaderCollectionPrefix/HeaderCollectionPrefix.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/Inheritance/Inheritance.csproj b/test/TestProjects/Inheritance/Inheritance.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/Inheritance/Inheritance.csproj
+++ b/test/TestProjects/Inheritance/Inheritance.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj b/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj
+++ b/test/TestProjects/JsonAsBinary/JsonAsBinary.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/MgmtOperations/MgmtOperations.csproj b/test/TestProjects/MgmtOperations/MgmtOperations.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/MgmtOperations/MgmtOperations.csproj
+++ b/test/TestProjects/MgmtOperations/MgmtOperations.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs b/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs
index 28dfb24e18d..0d229b0a0f0 100644
--- a/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs
+++ b/test/TestProjects/MgmtParent/Generated/Extensions/SubscriptionExtensions.cs
@@ -31,7 +31,7 @@ private static AvailabilitySetsRestOperations GetAvailabilitySetsRestOperations(
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable 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
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/MgmtParent/MgmtParent.csproj
+++ b/test/TestProjects/MgmtParent/MgmtParent.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj b/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj
+++ b/test/TestProjects/MgmtSingleton/MgmtSingleton.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/ModelNamespace/ModelNamespace.csproj b/test/TestProjects/ModelNamespace/ModelNamespace.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/ModelNamespace/ModelNamespace.csproj
+++ b/test/TestProjects/ModelNamespace/ModelNamespace.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/ModelShapes/ModelShapes.csproj b/test/TestProjects/ModelShapes/ModelShapes.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/ModelShapes/ModelShapes.csproj
+++ b/test/TestProjects/ModelShapes/ModelShapes.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/ModelWithConverterUsage/ModelWithConverterUsage.csproj b/test/TestProjects/ModelWithConverterUsage/ModelWithConverterUsage.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/ModelWithConverterUsage/ModelWithConverterUsage.csproj
+++ b/test/TestProjects/ModelWithConverterUsage/ModelWithConverterUsage.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/NameConflicts/NameConflicts.csproj b/test/TestProjects/NameConflicts/NameConflicts.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/NameConflicts/NameConflicts.csproj
+++ b/test/TestProjects/NameConflicts/NameConflicts.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj b/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj
+++ b/test/TestProjects/OperationGroupMappings/OperationGroupMappings.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/PublicClientCtor/PublicClientCtor.csproj b/test/TestProjects/PublicClientCtor/PublicClientCtor.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/PublicClientCtor/PublicClientCtor.csproj
+++ b/test/TestProjects/PublicClientCtor/PublicClientCtor.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj b/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj
+++ b/test/TestProjects/ResourceIdentifierChooser/ResourceIdentifierChooser.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/ResourceRename/ResourceRename.csproj b/test/TestProjects/ResourceRename/ResourceRename.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/ResourceRename/ResourceRename.csproj
+++ b/test/TestProjects/ResourceRename/ResourceRename.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/SubscriptionExtensions/Generated/Extensions/SubscriptionExtensions.cs b/test/TestProjects/SubscriptionExtensions/Generated/Extensions/SubscriptionExtensions.cs
index ec4d75cc542..93cba48693d 100644
--- a/test/TestProjects/SubscriptionExtensions/Generated/Extensions/SubscriptionExtensions.cs
+++ b/test/TestProjects/SubscriptionExtensions/Generated/Extensions/SubscriptionExtensions.cs
@@ -41,7 +41,7 @@ private static OvensRestOperations GetOvensRestOperations(ClientDiagnostics clie
/// A collection of resource operations that may take multiple service requests to iterate over.
public static AsyncPageable ListOvenAsync(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 = GetOvensRestOperations(clientDiagnostics, credential, options, pipeline, subscription.Id.SubscriptionId, baseUri);
diff --git a/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj b/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj
+++ b/test/TestProjects/SubscriptionExtensions/SubscriptionExtensions.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj b/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj
+++ b/test/TestProjects/SupersetInheritance/SupersetInheritance.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/TenantOnly/TenantOnly.csproj b/test/TestProjects/TenantOnly/TenantOnly.csproj
index 89bb66a6ded..b32310e97aa 100644
--- a/test/TestProjects/TenantOnly/TenantOnly.csproj
+++ b/test/TestProjects/TenantOnly/TenantOnly.csproj
@@ -11,11 +11,11 @@
-
+
-
+
diff --git a/test/TestProjects/TypeSchemaMapping/TypeSchemaMapping.csproj b/test/TestProjects/TypeSchemaMapping/TypeSchemaMapping.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestProjects/TypeSchemaMapping/TypeSchemaMapping.csproj
+++ b/test/TestProjects/TypeSchemaMapping/TypeSchemaMapping.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/additionalProperties/additionalProperties.csproj b/test/TestServerProjects/additionalProperties/additionalProperties.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/additionalProperties/additionalProperties.csproj
+++ b/test/TestServerProjects/additionalProperties/additionalProperties.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/azure-parameter-grouping/azure_parameter_grouping.csproj b/test/TestServerProjects/azure-parameter-grouping/azure_parameter_grouping.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/azure-parameter-grouping/azure_parameter_grouping.csproj
+++ b/test/TestServerProjects/azure-parameter-grouping/azure_parameter_grouping.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/azure-special-properties/azure_special_properties.csproj b/test/TestServerProjects/azure-special-properties/azure_special_properties.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/azure-special-properties/azure_special_properties.csproj
+++ b/test/TestServerProjects/azure-special-properties/azure_special_properties.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-array/body_array.csproj b/test/TestServerProjects/body-array/body_array.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-array/body_array.csproj
+++ b/test/TestServerProjects/body-array/body_array.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-boolean/body_boolean.csproj b/test/TestServerProjects/body-boolean/body_boolean.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-boolean/body_boolean.csproj
+++ b/test/TestServerProjects/body-boolean/body_boolean.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-byte/body_byte.csproj b/test/TestServerProjects/body-byte/body_byte.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-byte/body_byte.csproj
+++ b/test/TestServerProjects/body-byte/body_byte.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-complex/body_complex.csproj b/test/TestServerProjects/body-complex/body_complex.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-complex/body_complex.csproj
+++ b/test/TestServerProjects/body-complex/body_complex.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-date/body_date.csproj b/test/TestServerProjects/body-date/body_date.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-date/body_date.csproj
+++ b/test/TestServerProjects/body-date/body_date.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-datetime-rfc1123/body_datetime_rfc1123.csproj b/test/TestServerProjects/body-datetime-rfc1123/body_datetime_rfc1123.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-datetime-rfc1123/body_datetime_rfc1123.csproj
+++ b/test/TestServerProjects/body-datetime-rfc1123/body_datetime_rfc1123.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-datetime/body_datetime.csproj b/test/TestServerProjects/body-datetime/body_datetime.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-datetime/body_datetime.csproj
+++ b/test/TestServerProjects/body-datetime/body_datetime.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-dictionary/body_dictionary.csproj b/test/TestServerProjects/body-dictionary/body_dictionary.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-dictionary/body_dictionary.csproj
+++ b/test/TestServerProjects/body-dictionary/body_dictionary.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-duration/body_duration.csproj b/test/TestServerProjects/body-duration/body_duration.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-duration/body_duration.csproj
+++ b/test/TestServerProjects/body-duration/body_duration.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-file/body_file.csproj b/test/TestServerProjects/body-file/body_file.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-file/body_file.csproj
+++ b/test/TestServerProjects/body-file/body_file.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-formdata-urlencoded/body_formdata_urlencoded.csproj b/test/TestServerProjects/body-formdata-urlencoded/body_formdata_urlencoded.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-formdata-urlencoded/body_formdata_urlencoded.csproj
+++ b/test/TestServerProjects/body-formdata-urlencoded/body_formdata_urlencoded.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-formdata/body_formdata.csproj b/test/TestServerProjects/body-formdata/body_formdata.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-formdata/body_formdata.csproj
+++ b/test/TestServerProjects/body-formdata/body_formdata.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-integer/body_integer.csproj b/test/TestServerProjects/body-integer/body_integer.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-integer/body_integer.csproj
+++ b/test/TestServerProjects/body-integer/body_integer.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-number/body_number.csproj b/test/TestServerProjects/body-number/body_number.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-number/body_number.csproj
+++ b/test/TestServerProjects/body-number/body_number.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-string/body_string.csproj b/test/TestServerProjects/body-string/body_string.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-string/body_string.csproj
+++ b/test/TestServerProjects/body-string/body_string.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/body-time/body_time.csproj b/test/TestServerProjects/body-time/body_time.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/body-time/body_time.csproj
+++ b/test/TestServerProjects/body-time/body_time.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/constants/constants.csproj b/test/TestServerProjects/constants/constants.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/constants/constants.csproj
+++ b/test/TestServerProjects/constants/constants.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/custom-baseUrl-more-options/custom_baseUrl_more_options.csproj b/test/TestServerProjects/custom-baseUrl-more-options/custom_baseUrl_more_options.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/custom-baseUrl-more-options/custom_baseUrl_more_options.csproj
+++ b/test/TestServerProjects/custom-baseUrl-more-options/custom_baseUrl_more_options.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/custom-baseUrl-paging/custom_baseUrl_paging.csproj b/test/TestServerProjects/custom-baseUrl-paging/custom_baseUrl_paging.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/custom-baseUrl-paging/custom_baseUrl_paging.csproj
+++ b/test/TestServerProjects/custom-baseUrl-paging/custom_baseUrl_paging.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/custom-baseUrl/custom_baseUrl.csproj b/test/TestServerProjects/custom-baseUrl/custom_baseUrl.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/custom-baseUrl/custom_baseUrl.csproj
+++ b/test/TestServerProjects/custom-baseUrl/custom_baseUrl.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/extensible-enums-swagger/extensible_enums_swagger.csproj b/test/TestServerProjects/extensible-enums-swagger/extensible_enums_swagger.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/extensible-enums-swagger/extensible_enums_swagger.csproj
+++ b/test/TestServerProjects/extensible-enums-swagger/extensible_enums_swagger.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/head/head.csproj b/test/TestServerProjects/head/head.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/head/head.csproj
+++ b/test/TestServerProjects/head/head.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/header/header.csproj b/test/TestServerProjects/header/header.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/header/header.csproj
+++ b/test/TestServerProjects/header/header.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/httpInfrastructure/httpInfrastructure.csproj b/test/TestServerProjects/httpInfrastructure/httpInfrastructure.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/httpInfrastructure/httpInfrastructure.csproj
+++ b/test/TestServerProjects/httpInfrastructure/httpInfrastructure.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/lro-parameterized-endpoints/lro_parameterized_endpoints.csproj b/test/TestServerProjects/lro-parameterized-endpoints/lro_parameterized_endpoints.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/lro-parameterized-endpoints/lro_parameterized_endpoints.csproj
+++ b/test/TestServerProjects/lro-parameterized-endpoints/lro_parameterized_endpoints.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/lro/lro.csproj b/test/TestServerProjects/lro/lro.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/lro/lro.csproj
+++ b/test/TestServerProjects/lro/lro.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/media_types/media_types.csproj b/test/TestServerProjects/media_types/media_types.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/media_types/media_types.csproj
+++ b/test/TestServerProjects/media_types/media_types.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/model-flattening/model_flattening.csproj b/test/TestServerProjects/model-flattening/model_flattening.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/model-flattening/model_flattening.csproj
+++ b/test/TestServerProjects/model-flattening/model_flattening.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/multiple-inheritance/multiple_inheritance.csproj b/test/TestServerProjects/multiple-inheritance/multiple_inheritance.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/multiple-inheritance/multiple_inheritance.csproj
+++ b/test/TestServerProjects/multiple-inheritance/multiple_inheritance.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/non-string-enum/non_string_enum.csproj b/test/TestServerProjects/non-string-enum/non_string_enum.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/non-string-enum/non_string_enum.csproj
+++ b/test/TestServerProjects/non-string-enum/non_string_enum.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/object-type/object_type.csproj b/test/TestServerProjects/object-type/object_type.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/object-type/object_type.csproj
+++ b/test/TestServerProjects/object-type/object_type.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/paging/paging.csproj b/test/TestServerProjects/paging/paging.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/paging/paging.csproj
+++ b/test/TestServerProjects/paging/paging.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/required-optional/required_optional.csproj b/test/TestServerProjects/required-optional/required_optional.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/required-optional/required_optional.csproj
+++ b/test/TestServerProjects/required-optional/required_optional.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/subscriptionId-apiVersion/subscriptionId_apiVersion.csproj b/test/TestServerProjects/subscriptionId-apiVersion/subscriptionId_apiVersion.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/subscriptionId-apiVersion/subscriptionId_apiVersion.csproj
+++ b/test/TestServerProjects/subscriptionId-apiVersion/subscriptionId_apiVersion.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/url-multi-collectionFormat/url_multi_collectionFormat.csproj b/test/TestServerProjects/url-multi-collectionFormat/url_multi_collectionFormat.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/url-multi-collectionFormat/url_multi_collectionFormat.csproj
+++ b/test/TestServerProjects/url-multi-collectionFormat/url_multi_collectionFormat.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/url/url.csproj b/test/TestServerProjects/url/url.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/url/url.csproj
+++ b/test/TestServerProjects/url/url.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/validation/validation.csproj b/test/TestServerProjects/validation/validation.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/validation/validation.csproj
+++ b/test/TestServerProjects/validation/validation.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/xml-service/xml_service.csproj b/test/TestServerProjects/xml-service/xml_service.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/xml-service/xml_service.csproj
+++ b/test/TestServerProjects/xml-service/xml_service.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjects/xms-error-responses/xms_error_responses.csproj b/test/TestServerProjects/xms-error-responses/xms_error_responses.csproj
index 4d853594271..9adcb9bb822 100644
--- a/test/TestServerProjects/xms-error-responses/xms_error_responses.csproj
+++ b/test/TestServerProjects/xms-error-responses/xms_error_responses.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/test/TestServerProjectsLowLevel/body-complex/body_complex_LowLevel.csproj b/test/TestServerProjectsLowLevel/body-complex/body_complex_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestServerProjectsLowLevel/body-complex/body_complex_LowLevel.csproj
+++ b/test/TestServerProjectsLowLevel/body-complex/body_complex_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestServerProjectsLowLevel/body-string/body_string_LowLevel.csproj b/test/TestServerProjectsLowLevel/body-string/body_string_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestServerProjectsLowLevel/body-string/body_string_LowLevel.csproj
+++ b/test/TestServerProjectsLowLevel/body-string/body_string_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestServerProjectsLowLevel/header/header_LowLevel.csproj b/test/TestServerProjectsLowLevel/header/header_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestServerProjectsLowLevel/header/header_LowLevel.csproj
+++ b/test/TestServerProjectsLowLevel/header/header_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestServerProjectsLowLevel/url-multi-collectionFormat/url_multi_collectionFormat_LowLevel.csproj b/test/TestServerProjectsLowLevel/url-multi-collectionFormat/url_multi_collectionFormat_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestServerProjectsLowLevel/url-multi-collectionFormat/url_multi_collectionFormat_LowLevel.csproj
+++ b/test/TestServerProjectsLowLevel/url-multi-collectionFormat/url_multi_collectionFormat_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/test/TestServerProjectsLowLevel/url/url_LowLevel.csproj b/test/TestServerProjectsLowLevel/url/url_LowLevel.csproj
index 6febdb29728..0b6426cb37e 100644
--- a/test/TestServerProjectsLowLevel/url/url_LowLevel.csproj
+++ b/test/TestServerProjectsLowLevel/url/url_LowLevel.csproj
@@ -11,7 +11,7 @@
-
+