Merge branch 'azure-sdk:main' into main

Author: Unity-Billal-mesloub

eng/Packages.Data.props

@@ -244,7 +244,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20241226.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20250104.1" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
@@ -259,7 +259,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241223.1" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250106.3" />
   </ItemGroup>
 
   <!--
@@ -414,7 +414,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TestProxyVersion>1.0.0-dev.20241209.1</TestProxyVersion>
+    <TestProxyVersion>1.0.0-dev.20241213.1</TestProxyVersion>
   </PropertyGroup>
 
 </Project>

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

@@ -130,7 +130,7 @@ jobs:
         Write-Host "##vso[task.setvariable variable=InternalVariableGroups]$internalVariableGroups"
         Write-Host "##vso[task.setvariable variable=TestVariableGroups]$testVariableGroups"
         Write-Host "##vso[task.setvariable variable=TestServiceConnections]$testServiceConnections"
-        Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServviceConnections"
+        Write-Host "##vso[task.setvariable variable=InternalServiceConnections]$internalServiceConnections"
         Write-host "##vso[task.setvariable variable=GeneratePublicCIPipeline]$generatePublicCIPipeline"
         Write-Host "##vso[task.setvariable variable=GenerateUnifiedWeekly]$generateUnifiedWeekly"
       displayName: Setup pipeline generation variables

eng/common/testproxy/target_version.txt

@@ -1 +1 @@
-1.0.0-dev.20241209.1
+1.0.0-dev.20241213.1

eng/containers/ci.yml

@@ -8,32 +8,55 @@ trigger:
     include:
     - eng/containers/
 
-pool:
-  vmImage: 'ubuntu-20.04'
+extends:
+  template: /eng/pipelines/templates/stages/1es-redirect.yml
+  parameters:
+    stages:
+    - stage:
+      displayName: Docker Build and Publish
+      variables:
+      - template: /eng/pipelines/templates/variables/globals.yml
+      - template: /eng/pipelines/templates/variables/image.yml
+      - name: configPath
+        value: ./eng/containers/UbuntuNetCoreKeyring
+      - name: containerRegistry
+        value: 'azsdkengsys'
+      - name: imageRepository
+        value: 'dotnet/ubuntu_netcore_keyring'
+      - name: imageTag
+        value: $(build.buildid)
 
-variables:
-  - template: /eng/pipelines/templates/variables/globals.yml
-  - name: dockerfile
-    value: ./eng/containers/UbuntuNetCoreKeyring/Dockerfile
-  - name: containerRegistry
-    value: 'azsdkengsys'
-  - name: imageRepository
-    value: 'dotnet/ubuntu_netcore_keyring'
-  - name: imageTag
-    value: $(build.buildid)
+      jobs:
+      - job:
+        displayName: Docker Build and Publish
+        pool:
+          name: $(LINUXPOOL)
+          image: $(LINUXVMIMAGE)
+          os: linux
 
-steps:
-- task: Docker@2
-  displayName: Build Docker Image
-  inputs:
-    command: build
-    Dockerfile: $(dockerfile)
-    tags: $(imageTag)
-    arguments: '-t $(containerRegistry).azurecr.io/$(imageRepository):$(imageTag)'
-- task: Docker@2
-  displayName: Push Docker Image
-  inputs:
-    containerRegistry: $(containerRegistry)
-    repository: $(imageRepository)
-    command: push
-    tags: $(imageTag)
+        templateContext:
+          outputs:
+          - output: containerImage
+            image: image:tag
+            remoteImage:
+            - $(containerRegistry).azurecr.io/$(imageRepository):$(imageTag)
+
+        steps:
+        - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
+
+        - task: AzureCLI@2
+          displayName: Login to $(containerRegistry)
+          inputs:
+            azureSubscription: "Azure SDK Engineering System"
+            scriptType: pscore
+            scriptLocation: inlineScript
+            inlineScript: |
+              az acr login --name $(containerRegistry)
+
+        - task: 1ES.BuildContainerImage@1
+          displayName: Build Docker Image
+          inputs:
+            path: $(configPath)
+            image: image:tag
+            enableNetwork: true
+            useBuildKit: true

eng/emitter-package-lock.json

@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-csharp": "0.2.0-beta.20241226.1"
+    "@azure-tools/typespec-csharp": "0.2.0-beta.20250104.1"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.49.0",

eng/emitter-package.json

@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Generator.CSharp.ClientModel;
+using Microsoft.Generator.CSharp.ClientModel.Providers;
+using Microsoft.Generator.CSharp.Primitives;
+using Microsoft.Generator.CSharp.Providers;
+using System.IO;
+
+namespace Azure.Generator
+{
+    // only apply for MPG
+    internal class AzureArmVisitor : ScmLibraryVisitor
+    {
+        /// <inheritdoc/>
+        protected override TypeProvider? Visit(TypeProvider type)
+        {
+            if (type is ClientProvider)
+            {
+                type.Update(modifiers: TransfromPublicModifiersToInternal(type), relativeFilePath: TransformRelativeFilePathForClient(type));
+            }
+            // TODO: uncomment this once resources are generated
+            //if (type is RestClientProvider)
+            //{
+            //    type.Update(modifiers: TransfromModifiers(type), relativeFilePath: TransformRelativeFilePathForRestClient(type));
+            //}
+            return type;
+        }
+
+        private static string TransformRelativeFilePathForClient(TypeProvider type)
+            => Path.Combine("src", "Generated", "RestOperations", $"{type.Name}RestOperations.cs");
+
+        private static string TransformRelativeFilePathForRestClient(TypeProvider type)
+            => Path.Combine("src", "Generated", "RestOperations", $"{type.Name}.RestClient.cs");
+
+        private static TypeSignatureModifiers TransfromPublicModifiersToInternal(TypeProvider type)
+        {
+            var modifiers = type.DeclarationModifiers;
+            if (modifiers.HasFlag(TypeSignatureModifiers.Public))
+            {
+                modifiers &= ~TypeSignatureModifiers.Public;
+                modifiers |= TypeSignatureModifiers.Internal;
+            }
+
+            return modifiers;
+        }
+    }
+}

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

@@ -49,6 +49,10 @@ public override void Configure()
         AddMetadataReference(MetadataReference.CreateFromFile(typeof(Response).Assembly.Location));
         var sharedSourceDirectory = Path.Combine(Path.GetDirectoryName(typeof(AzureClientPlugin).Assembly.Location)!, "Shared", "Core");
         AddSharedSourceDirectory(sharedSourceDirectory);
+        if (IsAzureArm.Value)
+        {
+            AddVisitor(new AzureArmVisitor());
+        }
     }
 
     /// <summary>

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

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Azure.Generator.InputTransformation;
 using Azure.Generator.Primitives;
 using Azure.Generator.Providers;
 using Azure.Generator.Providers.Abstraction;
@@ -13,7 +14,6 @@
 using Microsoft.Generator.CSharp.Statements;
 using System;
 using System.ClientModel.Primitives;
-using System.Collections.Generic;
 using System.Text.Json;
 
 namespace Azure.Generator
@@ -107,20 +107,7 @@ public override MethodBodyStatement SerializeJsonValue(Type valueType, ValueExpr
         }
 
         /// <inheritdoc/>
-        protected override ClientProvider CreateClientCore(InputClient inputClient) => base.CreateClientCore(TransformInputClient(inputClient));
-
-        private InputClient TransformInputClient(InputClient client)
-        {
-            var operationsToKeep = new List<InputOperation>();
-            foreach (var operation in client.Operations)
-            {
-                // operations_list has been covered in Azure.ResourceManager already, we don't need to generate it in the client
-                if (operation.CrossLanguageDefinitionId != "Azure.ResourceManager.Operations.list")
-                {
-                    operationsToKeep.Add(operation);
-                }
-            }
-            return new InputClient(client.Name, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent);
-        }
+        protected override ClientProvider CreateClientCore(InputClient inputClient)
+            => AzureClientPlugin.Instance.IsAzureArm.Value ? base.CreateClientCore(InputClientTransformer.TransformInputClient(inputClient)) : base.CreateClientCore(inputClient);
     }
 }

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

@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Microsoft.Generator.CSharp.Input;
+using System;
+using System.Collections.Generic;
+
+namespace Azure.Generator.InputTransformation
+{
+    internal static class InputClientTransformer
+    {
+        public static InputClient TransformInputClient(InputClient client)
+        {
+            var operationsToKeep = new List<InputOperation>();
+            foreach (var operation in client.Operations)
+            {
+                // operations_list has been covered in Azure.ResourceManager already, we don't need to generate it in the client
+                if (operation.CrossLanguageDefinitionId != "Azure.ResourceManager.Operations.list")
+                {
+                    var transformedOperation = new InputOperation(operation.Name, operation.ResourceName, operation.Summary, operation.Doc, operation.Deprecated, operation.Accessibility, TransformInputOperationParameters(operation), operation.Responses, operation.HttpMethod, operation.RequestBodyMediaType, operation.Uri, operation.Path, operation.ExternalDocsUrl, operation.RequestMediaTypes, operation.BufferResponse, operation.LongRunning, operation.Paging, operation.GenerateProtocolMethod, operation.GenerateConvenienceMethod, operation.CrossLanguageDefinitionId);
+                    operationsToKeep.Add(transformedOperation);
+                }
+            }
+            return new InputClient(client.Name, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent);
+        }
+
+        private static IReadOnlyList<InputParameter> TransformInputOperationParameters(InputOperation operation)
+        {
+            var parameters = new List<InputParameter>();
+            foreach (var parameter in operation.Parameters)
+            {
+                if (parameter.NameInRequest.Equals("subscriptionId", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Always set subscriptionId to method parameter
+                    parameters.Add(new InputParameter(parameter.Name, parameter.NameInRequest, parameter.Summary, parameter.Doc, parameter.Type, parameter.Location, parameter.DefaultValue, InputOperationParameterKind.Method, parameter.IsRequired, parameter.IsApiVersion, parameter.IsResourceParameter, parameter.IsContentType, parameter.IsEndpoint, parameter.SkipUrlEncoding, parameter.Explode, parameter.ArraySerializationDelimiter, parameter.HeaderCollectionPrefix));
+                }
+                else
+                {
+                    parameters.Add(parameter);
+                }
+            }
+            return parameters;
+        }
+    }
+}