update namespace for model types and use new mgmt telemetrypolicy (Azure#23538)

* update namespace for model types
update armclient to add new mgmttelemetrypolicy

* remove props change and update api

* use set value

Author: m-nash

eng/Directory.Build.Common.targets

@@ -171,11 +171,11 @@
 
   <!--TODO: update build targets - ADO 5668-->
   <PropertyGroup>
-    <MgmtCoreShared>$(MSBuildThisFileDirectory)/../common/ManagementCoreShared</MgmtCoreShared>
+    <MgmtCoreShared>$(MSBuildThisFileDirectory)/../sdk/resourcemanager/Azure.ResourceManager/src/Shared</MgmtCoreShared>
     <ExcludeMgmtCoreShared Condition="'$(ExcludeMgmtCoreShared)' == ''">false</ExcludeMgmtCoreShared>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(ExcludeMgmtCoreShared)' == 'false'">
+  <ItemGroup Condition="'$(IsMgmtSubLibrary)' == 'true' and '$(IsMgmtLibrary)' == 'true' and '$(IsTestProject)' != 'true' and '$(ExcludeMgmtCoreShared)' == 'false'">
     <Compile Include="$(MgmtCoreShared)/**/*.cs"
                  Link="Shared/Management/%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>

sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs

@@ -103,8 +103,12 @@ public ArmClient(
 
             Credential = credential;
             BaseUri = baseUri ?? new Uri(DefaultUri);
-            ClientOptions = options?.Clone() ?? new ArmClientOptions();
-            Pipeline = ManagementPipelineBuilder.Build(Credential, ClientOptions.Scope, options ?? ClientOptions);
+            options ??= new ArmClientOptions();
+            if (options.Diagnostics.IsTelemetryEnabled)
+                options.AddPolicy(new MgmtTelemetryPolicy(this, options), HttpPipelinePosition.PerRetry);
+            Pipeline = ManagementPipelineBuilder.Build(Credential, options.Scope, options);
+
+            ClientOptions = options.Clone();
 
             _tenant = new Tenant(ClientOptions, Credential, BaseUri, Pipeline);
             DefaultSubscription = string.IsNullOrWhiteSpace(defaultSubscriptionId)

sdk/resourcemanager/Azure.ResourceManager/src/ArmClient.cs

@@ -11,7 +11,9 @@ namespace Azure.ResourceManager
     /// <summary>
     /// A class representing Azure resource manager client options.
     /// </summary>
+#pragma warning disable AZC0008 // ClientOptions should have a nested enum called ServiceVersion
     public sealed class ArmClientOptions : ClientOptions
+#pragma warning restore AZC0008 // ClientOptions should have a nested enum called ServiceVersion
     {
         private readonly ConcurrentDictionary<Type, object> _overrides = new ConcurrentDictionary<Type, object>();
 

sdk/resourcemanager/Azure.ResourceManager/src/ArmClientOptions.cs

@@ -6,7 +6,7 @@
 using System.Globalization;
 using Azure.Core;
 
-namespace Azure.ResourceManager.Resources.Models
+namespace Azure.ResourceManager.Models
 {
     /// <summary>
     /// Representation of a publisher plan for marketplace RPs.

sdk/resourcemanager/Azure.ResourceManager/src/Custom/Resources/Models/Plan.cs

@@ -6,7 +6,7 @@
 using System.Globalization;
 using Azure.Core;
 
-namespace Azure.ResourceManager.Resources.Models
+namespace Azure.ResourceManager.Models
 {
     /// <summary>
     /// A class representing SKU for resource.

sdk/resourcemanager/Azure.ResourceManager/src/Custom/Resources/Models/Sku.cs

@@ -38,7 +38,7 @@ internal PredefinedTag(ClientContext clientContext, ResourceIdentifier id)
             : base(clientContext, id)
         {
             _clientDiagnostics = new ClientDiagnostics(ClientOptions);
-            _restClient = new TagRestOperations(_clientDiagnostics, Pipeline, Id.SubscriptionId, BaseUri);
+            _restClient = new TagRestOperations(_clientDiagnostics, Pipeline, ClientOptions, Id.SubscriptionId, BaseUri);
         }
 
         /// <summary>
@@ -52,7 +52,7 @@ internal PredefinedTag(ArmResource operations, PredefinedTagData data)
             _data = data;
             HasData = true;
             _clientDiagnostics = new ClientDiagnostics(ClientOptions);
-            _restClient = new TagRestOperations(_clientDiagnostics, Pipeline, Id.SubscriptionId, BaseUri);
+            _restClient = new TagRestOperations(_clientDiagnostics, Pipeline, ClientOptions, Id.SubscriptionId, BaseUri);
         }
 
         /// <summary>

sdk/resourcemanager/Azure.ResourceManager/src/Custom/Resources/PredefinedTag.cs

@@ -45,7 +45,7 @@ internal PredefinedTagContainer(ClientContext clientContext, ResourceIdentifier
         /// <summary>
         /// Gets the operations that can be performed on the container.
         /// </summary>
-        private TagRestOperations RestClient => _restClient ??= new TagRestOperations(Diagnostics, Pipeline, Id.SubscriptionId, BaseUri);
+        private TagRestOperations RestClient => _restClient ??= new TagRestOperations(Diagnostics, Pipeline, ClientOptions, Id.SubscriptionId, BaseUri);
 
         private ClientDiagnostics Diagnostics => _clientDiagnostics ??= new ClientDiagnostics(ClientOptions);
 

sdk/resourcemanager/Azure.ResourceManager/src/Custom/Resources/PredefinedTagContainer.cs

@@ -28,6 +28,7 @@ internal HttpMessage CreateGetAtTenantScopeRequest(string resourceProviderNamesp
             uri.AppendQuery("api-version", "2019-10-01", true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json");
+            message.SetProperty("UserAgentOverride", _userAgent);
             return message;
         }
 
@@ -106,6 +107,7 @@ internal HttpMessage CreateListAtTenantScopeRequest(int? top, string expand)
             uri.AppendQuery("api-version", "2019-10-01", true);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json");
+            message.SetProperty("UserAgentOverride", _userAgent);
             return message;
         }
 
@@ -119,6 +121,7 @@ internal HttpMessage CreateListAtTenantScopeNextPageRequest(string nextLink)
             uri.AppendRawNextLink(nextLink, false);
             request.Uri = uri;
             request.Headers.Add("Accept", "application/json");
+            message.SetProperty("UserAgentOverride", _userAgent);
             return message;
         }