Skip to content

Commit 154b751

Browse files
JoshLove-msftJoshLove-msft
authored
Remove temporary trigger exclusion (Azure#50216)
* Remove temporary trigger exclusion * Upgrade * upgrade fixes * regen * upgrade * regen
1 parent e6e0457 commit 154b751

File tree

15 files changed

+64
-59
lines changed

15 files changed

+64
-59
lines changed

‎eng/Packages.Data.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438

439439
<PropertyGroup>
440440
<TestProxyVersion>1.0.0-dev.20250501.1</TestProxyVersion>
441-
<UnbrandedGeneratorVersion>1.0.0-alpha.20250521.6</UnbrandedGeneratorVersion>
442-
<AzureGeneratorVersion>1.0.0-alpha.20250515.2</AzureGeneratorVersion>
441+
<UnbrandedGeneratorVersion>1.0.0-alpha.20250522.1</UnbrandedGeneratorVersion>
442+
<AzureGeneratorVersion>1.0.0-alpha.20250522.1</AzureGeneratorVersion>
443443
</PropertyGroup>
444444
</Project>

‎eng/packages/http-client-csharp-mgmt/ci.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ trigger:
66
include:
77
- eng/packages/http-client-csharp-mgmt
88
- eng/scripts/typespec
9-
exclude:
10-
- eng/packages/http-client-csharp-mgmt/ci.yml
119
pr:
1210
branches:
1311
include:
@@ -19,9 +17,7 @@ pr:
1917
include:
2018
- eng/packages/http-client-csharp-mgmt
2119
- eng/scripts/typespec
22-
exclude:
23-
- eng/packages/http-client-csharp-mgmt/ci.yml
24-
20+
2521
parameters:
2622
- name: UseTypeSpecNext
2723
displayName: "Use TypeSpec Next"

‎eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/InheritableSystemObjectModelVisitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private static void UpdateFullConstructor(ModelProvider model, FieldProvider raw
127127

128128
var body = model.FullConstructor.BodyStatements;
129129
var statement = rawDataField.Assign(model.FullConstructor.Signature.Parameters.Single(f => f.Name.Equals(RawDataParameterName))).Terminate();
130-
MethodBodyStatement[] updatedBody = [statement, .. body!.Flatten()];
130+
MethodBodyStatement[] updatedBody = [statement, .. body!];
131131
model.FullConstructor.Update(bodyStatements: updatedBody);
132132
}
133133

‎eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Providers/ResourceClientProvider.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -315,30 +315,30 @@ protected CSharpType GetOperationMethodReturnType(InputServiceMethod method, boo
315315
return isAsync ? new CSharpType(typeof(Task<>), new CSharpType(typeof(Response<>), ResourceClientCSharpType)) : new CSharpType(typeof(Response<>), ResourceClientCSharpType);
316316
}
317317

318-
private TryStatement BuildOperationMethodTryStatement(InputServiceMethod method, MethodProvider convenienceMethod, MethodSignature signature, bool isAsync, bool isGeneric)
318+
private TryExpression BuildOperationMethodTryStatement(InputServiceMethod method, MethodProvider convenienceMethod, MethodSignature signature, bool isAsync, bool isGeneric)
319319
{
320320
var operation = method.Operation;
321321
var cancellationToken = convenienceMethod.Signature.Parameters.Single(p => p.Type.Equals(typeof(CancellationToken)));
322322

323-
var tryStatement = new TryStatement();
323+
var tryStatements = new List<MethodBodyStatement>();
324324
var contextDeclaration = Declare("context", typeof(RequestContext), New.Instance(typeof(RequestContext), new Dictionary<ValueExpression, ValueExpression> { { Identifier(nameof(RequestContext.CancellationToken)), cancellationToken } }), out var contextVariable);
325-
tryStatement.Add(contextDeclaration);
325+
tryStatements.Add(contextDeclaration);
326326
var requestMethod = GetCorrespondingRequestMethod(operation);
327327
var messageDeclaration = Declare("message", typeof(HttpMessage), _restClientField.Invoke(requestMethod.Signature.Name, PopulateArguments(requestMethod.Signature.Parameters, convenienceMethod, contextVariable)), out var messageVariable);
328-
tryStatement.Add(messageDeclaration);
328+
tryStatements.Add(messageDeclaration);
329329
var responseType = GetResponseType(convenienceMethod, isAsync);
330330
VariableExpression responseVariable;
331331
if (!responseType.Equals(typeof(Response)))
332332
{
333333
var resultDeclaration = Declare("result", typeof(Response), This.Property("Pipeline").Invoke(isAsync ? "ProcessMessageAsync" : "ProcessMessage", [messageVariable, contextVariable], null, isAsync), out var resultVariable);
334-
tryStatement.Add(resultDeclaration);
334+
tryStatements.Add(resultDeclaration);
335335
var responseDeclaration = Declare("response", responseType, Static(typeof(Response)).Invoke(nameof(Response.FromValue), [resultVariable.CastTo(ResourceData.Type), resultVariable]), out responseVariable);
336-
tryStatement.Add(responseDeclaration);
336+
tryStatements.Add(responseDeclaration);
337337
}
338338
else
339339
{
340340
var responseDeclaration = Declare("response", typeof(Response), This.Property("Pipeline").Invoke(isAsync ? "ProcessMessageAsync" : "ProcessMessage", [messageVariable, contextVariable], null, isAsync), out responseVariable);
341-
tryStatement.Add(responseDeclaration);
341+
tryStatements.Add(responseDeclaration);
342342
}
343343

344344
if (method is InputLongRunningServiceMethod || method is InputLongRunningPagingServiceMethod)
@@ -357,21 +357,21 @@ private TryStatement BuildOperationMethodTryStatement(InputServiceMethod method,
357357
ValueExpression[] armOperationArguments = [_clientDiagonosticsField, This.Property("Pipeline"), messageVariable.Property("Request"), isGeneric ? responseVariable.Invoke("GetRawResponse") : responseVariable, Static(typeof(OperationFinalStateVia)).Property(finalStateVia.ToString())];
358358
var operationDeclaration = Declare("operation", armOperationType, New.Instance(armOperationType, isGeneric ? [New.Instance(Source.Type, This.Property("Client")), .. armOperationArguments] : armOperationArguments), out var operationVariable);
359359

360-
tryStatement.Add(operationDeclaration);
361-
tryStatement.Add(new IfStatement(KnownAzureParameters.WaitUntil.Equal(Static(typeof(WaitUntil)).Property(nameof(WaitUntil.Completed))))
360+
tryStatements.Add(operationDeclaration);
361+
tryStatements.Add(new IfStatement(KnownAzureParameters.WaitUntil.Equal(Static(typeof(WaitUntil)).Property(nameof(WaitUntil.Completed))))
362362
{
363363
isAsync
364364
? operationVariable.Invoke(isGeneric ? "WaitForCompletionAsync" : "WaitForCompletionResponseAsync", [cancellationToken], null, isAsync).Terminate()
365365
: operationVariable.Invoke(isGeneric ? "WaitForCompletion" : "WaitForCompletionResponse", cancellationToken).Terminate()
366366
});
367-
tryStatement.Add(Return(operationVariable));
367+
tryStatements.Add(Return(operationVariable));
368368
}
369369
else
370370
{
371-
tryStatement.Add(BuildReturnStatements(responseVariable, signature));
371+
tryStatements.Add(BuildReturnStatements(responseVariable, signature));
372372
}
373373

374-
return tryStatement;
374+
return new TryExpression(tryStatements);
375375
}
376376

377377
protected virtual MethodBodyStatement BuildReturnStatements(ValueExpression responseVariable, MethodSignature signature)

‎eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/test/TestHelpers/ManagementMockHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static Mock<ManagementClientGenerator> LoadMockPlugin(
7878
mockPluginInstance.SetupGet(p => p.TypeFactory).Returns(mockTypeFactory.Object);
7979
}
8080

81-
var sourceInputModel = new Mock<SourceInputModel>(() => new SourceInputModel(null)) { CallBase = true };
81+
var sourceInputModel = new Mock<SourceInputModel>(() => new SourceInputModel(null, null)) { CallBase = true };
8282
mockPluginInstance.Setup(p => p.SourceInputModel).Returns(sourceInputModel.Object);
8383
var configureMethod = typeof(CodeModelGenerator).GetMethod(
8484
"Configure",

‎eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/FooData.cs‎

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Internal/RequestContextExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/Generated/Models/FooProperties.cs‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/src/MgmtTypeSpec.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/NoValueResponseOfT.cs" LinkBase="Shared/Core" />
2121
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/AsyncLockWithValue.cs" LinkBase="Shared/Core" />
2222
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/FixedDelayWithNoJitterStrategy.cs" LinkBase="Shared/Core" />
23+
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/HttpPipelineExtensions.cs" LinkBase="Shared/Core" />
2324
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/IOperationSource.cs" LinkBase="Shared/Core" />
2425
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs" LinkBase="Shared/Core" />
2526
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/OperationFinalStateVia.cs" LinkBase="Shared/Core" />
2627
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/OperationInternal.cs" LinkBase="Shared/Core" />
2728
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/OperationInternalBase.cs" LinkBase="Shared/Core" />
2829
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/OperationInternalOfT.cs" LinkBase="Shared/Core" />
2930
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/OperationPoller.cs" LinkBase="Shared/Core" />
31+
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/ProtocolOperation.cs" LinkBase="Shared/Core" />
32+
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/ProtocolOperationHelpers.cs" LinkBase="Shared/Core" />
3033
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/SequentialDelayStrategy.cs" LinkBase="Shared/Core" />
3134
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/TaskExtensions.cs" LinkBase="Shared/Core" />
3235
<Compile Include="$(MSBuildThisFileDirectory)../../../../../../../../sdk/core/Azure.Core/src/Shared/VoidValue.cs" LinkBase="Shared/Core" />

‎eng/packages/http-client-csharp-mgmt/generator/TestProjects/Local/Mgmt-TypeSpec/tspCodeModel.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,8 +1801,10 @@
18011801
"readOnly": true,
18021802
"decorators": [],
18031803
"crossLanguageDefinitionId": "MgmtTypeSpec.PrivateLinkResource.name",
1804-
"discriminator": false,
1805-
"flatten": false
1804+
"explode": false,
1805+
"style": "simple",
1806+
"allowReserved": false,
1807+
"correspondingMethodParams": []
18061808
},
18071809
{
18081810
"$id": "229",
@@ -2503,8 +2505,10 @@
25032505
"readOnly": false,
25042506
"decorators": [],
25052507
"crossLanguageDefinitionId": "Azure.ResourceManager.ArmOperationStatus.id",
2506-
"discriminator": false,
2507-
"flatten": false
2508+
"explode": false,
2509+
"style": "simple",
2510+
"allowReserved": false,
2511+
"correspondingMethodParams": []
25082512
},
25092513
{
25102514
"$id": "322",
@@ -2947,8 +2951,10 @@
29472951
"readOnly": true,
29482952
"decorators": [],
29492953
"crossLanguageDefinitionId": "MgmtTypeSpec.Foo.name",
2950-
"discriminator": false,
2951-
"flatten": false
2954+
"explode": false,
2955+
"style": "simple",
2956+
"allowReserved": false,
2957+
"correspondingMethodParams": []
29522958
},
29532959
{
29542960
"$id": "385",

0 commit comments

Comments
 (0)