Merge branch 'feature/v3' into customPage3386

Azure · May 12, 2023 · e8dc44d · e8dc44d
2 parents 265c0bb + 79a6291
commit e8dc44d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/AutoRest.CSharp/Common/Output/Models/Types/ModelFactoryTypeProvider.cs b/src/AutoRest.CSharp/Common/Output/Models/Types/ModelFactoryTypeProvider.cs
@@ -42,7 +42,7 @@ private ModelFactoryTypeProvider(IEnumerable<SerializableObjectType> objectTypes
             DefaultAccessibility = "public";
         }
 
-        public static ModelFactoryTypeProvider? TryCreate(string defaultClientName, string rootNamespaceName, IEnumerable<TypeProvider> models, SourceInputModel? sourceInputModel)
+        public static ModelFactoryTypeProvider? TryCreate(string defaultClientName, string rootNamespaceName, IEnumerable<TypeProvider> models, SourceInputModel? sourceInputModel, string? namespaceOverride = null)
         {
             if (!Configuration.GenerateModelFactory)
                 return null;
@@ -56,7 +56,7 @@ private ModelFactoryTypeProvider(IEnumerable<SerializableObjectType> objectTypes
                 return null;
             }
 
-            var defaultNamespace = GetDefaultModelNamespace(null, rootNamespaceName);
+            var defaultNamespace = namespaceOverride ?? GetDefaultModelNamespace(null, rootNamespaceName);
 
             return new ModelFactoryTypeProvider(objectTypes, defaultClientName, defaultNamespace, sourceInputModel);
         }

diff --git a/src/AutoRest.CSharp/Mgmt/AutoRest/MgmtOutputLibrary.cs b/src/AutoRest.CSharp/Mgmt/AutoRest/MgmtOutputLibrary.cs
@@ -378,17 +378,19 @@ private Dictionary<Operation, RestClientMethod> EnsureRestClientMethods()
         }
 
         private ModelFactoryTypeProvider? _modelFactory;
-        public ModelFactoryTypeProvider? ModelFactory => _modelFactory ??= ModelFactoryTypeProvider.TryCreate(GetModelFactoryName(), MgmtContext.Context.DefaultNamespace, AllSchemaMap.Values.Where(ShouldIncludeModel), MgmtContext.Context.SourceInputModel);
+        public ModelFactoryTypeProvider? ModelFactory => _modelFactory ??= ModelFactoryTypeProvider.TryCreate(GetModelFactoryName(), MgmtContext.Context.DefaultNamespace, AllSchemaMap.Values.Where(ShouldIncludeModel), MgmtContext.Context.SourceInputModel, GetModelFactoryNamespaceOverride());
 
         private static string GetModelFactoryName()
         {
             var baseName = MgmtContext.Context.DefaultNamespace.Split('.').Last();
             if (Configuration.MgmtConfiguration.IsArmCore)
-                return baseName;
+                return "ResourceManager";
 
             return $"Arm{baseName}";
         }
 
+        private static string? GetModelFactoryNamespaceOverride() => Configuration.MgmtConfiguration.IsArmCore ? "Azure.ResourceManager.Models" : null;
+
         private bool ShouldIncludeModel(TypeProvider model)
         {
             if (model is MgmtReferenceType)

diff --git a/src/AutoRest.CSharp/readme.md b/src/AutoRest.CSharp/readme.md
@@ -4,7 +4,7 @@
 ## Configuration
 ```yaml
 use-extension:
-  "@autorest/modelerfour": "4.25.0"
+  "@autorest/modelerfour": "4.26.0"
 modelerfour:
   always-create-content-type-parameter: true
 pipeline: