Upgrade MTG dependency version (Azure#48925)

* Upgrade MTG dependency version

* Add link to issue

* merge fixes

* delete

* Bump repo SCM version

* Fix emitter build

* Add minimal paging impl

* Fix generation script

* Fix extensions dependencies

* Remove sampleExe var

* revert scm changes

* PR fb

Author: JoshLove-msft

eng/Packages.Data.props

@@ -206,7 +206,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250307.1" />
+    <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250317.2" />
+    <PackageReference Update="System.ClientModel" Version="1.3.0" />
   </ItemGroup>
 
   <!--

eng/packages/http-client-csharp/emitter/src/emitter.ts

@@ -22,7 +22,7 @@ const singleton = "Azure.ResourceManager.@singleton";
 const resourceMetadata = "Azure.ClientGenerator.Core.@resourceSchema";
 
 export async function $onEmit(context: EmitContext<CSharpEmitterOptions>) {
-  context.options["plugin-name"] ??= "AzureClientPlugin";
+  context.options["generator-name"] ??= "AzureClientGenerator";
   context.options["emitter-extension-path"] = import.meta.url;
   context.options["update-code-model"] = updateCodeModel;
   setSDKContextOptions(azureSDKContextOptions);

eng/packages/http-client-csharp/eng/scripts/Generate.ps1

@@ -160,7 +160,7 @@ foreach ($directory in $directories) {
     if (-not (Test-Path $generationDir)) {
         New-Item -ItemType Directory -Path $generationDir | Out-Null
     }
-    
+
     if ($folders.Contains("versioning")) {
         Generate-Versioning $directory.FullName $generationDir -generateStub $stubbed
         $spectorLaunchProjects.Add($($folders -join "-") + "-v1", $("TestProjects/Spector/$($subPath.Replace([System.IO.Path]::DirectorySeparatorChar, '/'))") + "/v1")
@@ -180,7 +180,7 @@ foreach ($directory in $directories) {
     if ($LaunchOnly) {
         continue
     }
-    
+
     Write-Host "Generating $subPath" -ForegroundColor Cyan
     Invoke (Get-TspCommand $specFile $generationDir $stubbed -forceNewProject $ForceNewProject)
 
@@ -194,25 +194,24 @@ foreach ($directory in $directories) {
 if ($null -eq $filter) {
     Write-Host "Writing new launch settings" -ForegroundColor Cyan
     $mgcExe = "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.exe"
-    $sampleExe = "`$(SolutionDir)/../generator/artifacts/bin/SamplePlugin/Debug/net8.0/Microsoft.Generator.CSharp.exe"
     $basicSpec = "TestProjects/Local/Basic-TypeSpec"
     $mgmtSpec = "TestProjects/Local/Mgmt-TypeSpec"
 
     $launchSettings = @{}
     $launchSettings.Add("profiles", @{})
     $launchSettings["profiles"].Add("Basic-TypeSpec", @{})
-    $launchSettings["profiles"]["Basic-TypeSpec"].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$basicSpec -p AzureClientPlugin")
+    $launchSettings["profiles"]["Basic-TypeSpec"].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$basicSpec -g AzureClientGenerator")
     $launchSettings["profiles"]["Basic-TypeSpec"].Add("commandName", "Executable")
     $launchSettings["profiles"]["Basic-TypeSpec"].Add("executablePath", "dotnet")
-    
+
     $launchSettings["profiles"].Add("Mgmt-TypeSpec", @{})
-    $launchSettings["profiles"]["Mgmt-TypeSpec"].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$mgmtSpec -p AzureClientPlugin")
+    $launchSettings["profiles"]["Mgmt-TypeSpec"].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$mgmtSpec -g AzureClientGenerator")
     $launchSettings["profiles"]["Mgmt-TypeSpec"].Add("commandName", "Executable")
     $launchSettings["profiles"]["Mgmt-TypeSpec"].Add("executablePath", "dotnet")
 
     foreach ($kvp in $spectorLaunchProjects.GetEnumerator()) {
         $launchSettings["profiles"].Add($kvp.Key, @{})
-        $launchSettings["profiles"][$kvp.Key].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$($kvp.Value) -p AzureStubPlugin")
+        $launchSettings["profiles"][$kvp.Key].Add("commandLineArgs", "`$(SolutionDir)/../dist/generator/Microsoft.Generator.CSharp.dll `$(SolutionDir)/$($kvp.Value) -g AzureClientGenerator")
         $launchSettings["profiles"][$kvp.Key].Add("commandName", "Executable")
         $launchSettings["profiles"][$kvp.Key].Add("executablePath", "dotnet")
     }

eng/packages/http-client-csharp/eng/scripts/Generation.psm1

@@ -39,13 +39,13 @@ function Get-TspCommand {
     $command += " --option @azure-typespec/http-client-csharp.emitter-output-dir=$generationDir"
     $command += " --option @azure-typespec/http-client-csharp.save-inputs=true"
     if ($generateStub) {
-        $command += " --option @azure-typespec/http-client-csharp.plugin-name=AzureStubPlugin"
+        $command += " --option @azure-typespec/http-client-csharp.generator-name=AzureStubGenerator"
     }
 
     if ($namespaceOverride) {
         $command += " --option @azure-typespec/http-client-csharp.namespace=$namespaceOverride"
     }
-    
+
     if ($apiVersion) {
         $command += " --option @azure-typespec/http-client-csharp.api-version=$apiVersion"
     }
@@ -114,7 +114,7 @@ function Generate-Srv-Driven {
     ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces
     $namespaceRoot = $(($outputDir.Split([System.IO.Path]::DirectorySeparatorChar)[-2..-1] | `
         ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -replace '-(\p{L})', { $_.Groups[1].Value.ToUpper() } -replace '\W', '' -join ".")
-    $v1NamespaceOverride = $namespaceRoot + ".V1" 
+    $v1NamespaceOverride = $namespaceRoot + ".V1"
     $v2NamespaceOverride = $namespaceRoot + ".V2"
 
     $v1SpecFilePath = $(Join-Path $specFilePath "old.tsp")
@@ -141,7 +141,7 @@ function Generate-Versioning {
     if ($createOutputDirIfNotExist -and -not (Test-Path $v1Dir)) {
         New-Item -ItemType Directory -Path $v1Dir | Out-Null
     }
-    
+
     $v2Dir = $(Join-Path $outputDir "v2")
     if ($createOutputDirIfNotExist -and -not (Test-Path $v2Dir)) {
         New-Item -ItemType Directory -Path $v2Dir | Out-Null
@@ -150,12 +150,12 @@ function Generate-Versioning {
     ## get the last two directories of the output directory and add V1/V2 to disambiguate the namespaces
     $namespaceRoot = $(($outputFolders[-2..-1] | `
                            ForEach-Object { $_.Substring(0,1).ToUpper() + $_.Substring(1) }) -join ".")
-    $v1NamespaceOverride = $namespaceRoot + ".V1" 
+    $v1NamespaceOverride = $namespaceRoot + ".V1"
     $v2NamespaceOverride = $namespaceRoot + ".V2"
-      
+
     Invoke (Get-TspCommand $specFilePath $v1Dir -generateStub $generateStub -apiVersion "v1" -namespaceOverride $v1NamespaceOverride)
     Invoke (Get-TspCommand $specFilePath $v2Dir -generateStub $generateStub -apiVersion "v2" -namespaceOverride $v2NamespaceOverride)
-    
+
     if ($outputFolders.Contains("removed")) {
         $v2PreviewDir = $(Join-Path $outputDir "v2Preview")
         if ($createOutputDirIfNotExist -and -not (Test-Path $v2PreviewDir)) {

eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubPlugin.cs renamed to eng/packages/http-client-csharp/generator/Azure.Generator.StubLibrary/src/AzureStubGenerator.cs

@@ -9,16 +9,16 @@ namespace Azure.Generator.StubLibrary
     /// <summary>
     /// The stub library plugin to generate the stub library.
     /// </summary>
-    [Export(typeof(CodeModelPlugin))]
-    [ExportMetadata("PluginName", nameof(AzureStubPlugin))]
-    public class AzureStubPlugin : AzureClientPlugin
+    [Export(typeof(CodeModelGenerator))]
+    [ExportMetadata(GeneratorMetadataName, nameof(AzureStubGenerator))]
+    public class AzureStubGenerator : AzureClientGenerator
     {
         /// <summary>
         /// The stub library plugin to generate the stub library.
         /// </summary>
         /// <param name="context"> The Generator Context. </param>
         [ImportingConstructor]
-        public AzureStubPlugin(GeneratorContext context) : base(context) { }
+        public AzureStubGenerator(GeneratorContext context) : base(context) { }
 
         /// <summary>
         /// Customize the generation output for stub library.

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs renamed to eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientGenerator.cs

@@ -14,14 +14,14 @@
 namespace Azure.Generator;
 
 /// <summary>
-/// The Azure client plugin to generate the Azure client SDK.
+/// The Azure client generator to generate the Azure client SDK.
 /// </summary>
-[Export(typeof(CodeModelPlugin))]
-[ExportMetadata("PluginName", nameof(AzureClientPlugin))]
-public class AzureClientPlugin : ScmCodeModelPlugin
+[Export(typeof(CodeModelGenerator))]
+[ExportMetadata(GeneratorMetadataName, nameof(AzureClientGenerator))]
+public class AzureClientGenerator : ScmCodeModelGenerator
 {
-    private static AzureClientPlugin? _instance;
-    internal static AzureClientPlugin Instance => _instance ?? throw new InvalidOperationException("AzureClientPlugin is not loaded.");
+    private static AzureClientGenerator? _instance;
+    internal static AzureClientGenerator Instance => _instance ?? throw new InvalidOperationException("AzureClientGenerator is not loaded.");
 
     /// <inheritdoc/>
     public override AzureTypeFactory TypeFactory { get; }
@@ -34,11 +34,11 @@ public class AzureClientPlugin : ScmCodeModelPlugin
     public override AzureInputLibrary InputLibrary { get; }
 
     /// <summary>
-    /// The Azure client plugin to generate the Azure client SDK.
+    /// Constructs the Azure client generator used to generate the Azure client SDK.
     /// </summary>
     /// <param name="context"></param>
     [ImportingConstructor]
-    public AzureClientPlugin(GeneratorContext context) : base(context)
+    public AzureClientGenerator(GeneratorContext context) : base(context)
     {
         InputLibrary = new AzureInputLibrary(Configuration.OutputDirectory);
         TypeFactory = new AzureTypeFactory();
@@ -53,7 +53,7 @@ public override void Configure()
         base.Configure();
         // Include Azure.Core
         AddMetadataReference(MetadataReference.CreateFromFile(typeof(Response).Assembly.Location));
-        var sharedSourceDirectory = Path.Combine(Path.GetDirectoryName(typeof(AzureClientPlugin).Assembly.Location)!, "Shared", "Core");
+        var sharedSourceDirectory = Path.Combine(Path.GetDirectoryName(typeof(AzureClientGenerator).Assembly.Location)!, "Shared", "Core");
         AddSharedSourceDirectory(sharedSourceDirectory);
         AddVisitor(new NamespaceVisitor());
         if (IsAzureArm.Value)

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureOutputLibrary.cs

@@ -22,7 +22,7 @@ public class AzureOutputLibrary : ScmOutputLibrary
         private IReadOnlyList<ResourceClientProvider> BuildResources()
         {
             var result = new List<ResourceClientProvider>();
-            foreach (var client in AzureClientPlugin.Instance.InputLibrary.InputNamespace.Clients)
+            foreach (var client in AzureClientGenerator.Instance.InputLibrary.InputNamespace.Clients)
             {
                 // A resource client should contain the decorator "Azure.ResourceManager.@resourceMetadata"
                 var resourceMetadata = client.Decorators.FirstOrDefault(d => d.Name.Equals(KnownDecorators.ResourceMetadata));
@@ -31,7 +31,7 @@ private IReadOnlyList<ResourceClientProvider> BuildResources()
                     continue;
                 }
                 var resource = new ResourceClientProvider(client);
-                AzureClientPlugin.Instance.AddTypeToKeep(resource.Name);
+                AzureClientGenerator.Instance.AddTypeToKeep(resource.Name);
                 result.Add(resource);
             }
             return result;
@@ -42,7 +42,7 @@ private IReadOnlyList<ResourceClientProvider> BuildResources()
         protected override TypeProvider[] BuildTypeProviders()
         {
             var baseProviders = base.BuildTypeProviders();
-            if (AzureClientPlugin.Instance.IsAzureArm.Value == true)
+            if (AzureClientGenerator.Instance.IsAzureArm.Value == true)
             {
                 var resources = BuildResources();
                 return [.. baseProviders, new RequestContextExtensionsDefinition(), ArmOperation, GenericArmOperation, .. resources, .. resources.Select(r => r.Source)];

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs

@@ -113,7 +113,7 @@ public override MethodBodyStatement SerializeJsonValue(Type valueType, ValueExpr
         /// <inheritdoc/>
         protected override ClientProvider? CreateClientCore(InputClient inputClient)
         {
-            if (!AzureClientPlugin.Instance.IsAzureArm.Value)
+            if (!AzureClientGenerator.Instance.IsAzureArm.Value)
             {
                 return base.CreateClientCore(inputClient);
             }

eng/packages/http-client-csharp/generator/Azure.Generator/src/NamespaceVisitor.cs

@@ -47,7 +47,7 @@ internal class NamespaceVisitor : ScmLibraryVisitor
             }
             else
             {
-                type.Type.Update(@namespace: AzureClientPlugin.Instance.TypeFactory.PrimaryNamespace);
+                type.Type.Update(@namespace: AzureClientGenerator.Instance.TypeFactory.PrimaryNamespace);
             }
             return type;
         }
@@ -57,7 +57,7 @@ private static void UpdateModelsNamespace(TypeProvider type)
             // TODO: need to take consideration of model-namespace configuration
             // if model-namespace is false, set namespace to $"{AzureClientPlugin.Instance.TypeFactory.RootNamespace}"
             // if model-namespace is true, set namespace to $"{AzureClientPlugin.Instance.TypeFactory.RootNamespace}.Models"
-            type.Type.Update(@namespace: AzureClientPlugin.Instance.TypeFactory.GetCleanNameSpace($"{AzureClientPlugin.Instance.TypeFactory.PrimaryNamespace}.Models"));
+            type.Type.Update(@namespace: AzureClientGenerator.Instance.TypeFactory.GetCleanNameSpace($"{AzureClientGenerator.Instance.TypeFactory.PrimaryNamespace}.Models"));
         }
     }
 }

eng/packages/http-client-csharp/generator/Azure.Generator/src/Primitives/NewAzureProjectScaffolding.cs

@@ -23,10 +23,10 @@ protected override string GetSourceProjectFileContent()
         {
             var builder = new CSharpProjectWriter()
             {
-                Description = $"This is the {AzureClientPlugin.Instance.TypeFactory.PrimaryNamespace} client library for developing .NET applications with rich experience.",
-                AssemblyTitle = $"SDK Code Generation {AzureClientPlugin.Instance.TypeFactory.PrimaryNamespace}",
+                Description = $"This is the {AzureClientGenerator.Instance.TypeFactory.PrimaryNamespace} client library for developing .NET applications with rich experience.",
+                AssemblyTitle = $"SDK Code Generation {AzureClientGenerator.Instance.TypeFactory.PrimaryNamespace}",
                 Version = "1.0.0-beta.1",
-                PackageTags = AzureClientPlugin.Instance.TypeFactory.PrimaryNamespace,
+                PackageTags = AzureClientGenerator.Instance.TypeFactory.PrimaryNamespace,
                 GenerateDocumentationFile = true,
             };
 
@@ -36,7 +36,7 @@ protected override string GetSourceProjectFileContent()
             }
 
             int pathSegmentCount = GetPathSegmentCount();
-            if (AzureClientPlugin.Instance.InputLibrary.InputNamespace.Auth?.ApiKey is not null)
+            if (AzureClientGenerator.Instance.InputLibrary.InputNamespace.Auth?.ApiKey is not null)
             {
                 builder.CompileIncludes.Add(new CSharpProjectWriter.CSProjCompileInclude(GetCompileInclude("AzureKeyCredentialPolicy.cs", pathSegmentCount), "Shared/Core"));
             }
@@ -84,7 +84,7 @@ private static void TraverseInput(out bool hasOperation, out bool hasLongRunning
         {
             hasOperation = false;
             hasLongRunningOperation = false;
-            foreach (var inputClient in AzureClientPlugin.Instance.InputLibrary.InputNamespace.Clients)
+            foreach (var inputClient in AzureClientGenerator.Instance.InputLibrary.InputNamespace.Clients)
             {
                 foreach (var operation in inputClient.Operations)
                 {
@@ -100,7 +100,7 @@ private static void TraverseInput(out bool hasOperation, out bool hasLongRunning
 
         private static int GetPathSegmentCount()
         {
-            ReadOnlySpan<char> text = AzureClientPlugin.Instance.Configuration.OutputDirectory.AsSpan();
+            ReadOnlySpan<char> text = AzureClientGenerator.Instance.Configuration.OutputDirectory.AsSpan();
             // we are either a spector project in the eng folder or a real sdk in the sdk folder
             int beginning = text.IndexOf("eng");
             if (beginning == -1)
@@ -121,7 +121,7 @@ private string GetCompileInclude(string fileName, int pathSegmentCount)
         }
 
         private static readonly IReadOnlyList<CSharpProjectWriter.CSProjDependencyPackage> _azureDependencyPackages =
-            AzureClientPlugin.Instance.IsAzureArm.Value == true
+            AzureClientGenerator.Instance.IsAzureArm.Value == true
             ? [
                 new("Azure.Core"),
                 new("Azure.ResourceManager"),