From afc0efd629f64eda35eb4bf880cda19eff015b04 Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Sat, 12 Oct 2024 10:29:00 -0700 Subject: [PATCH] Prepare for release (#46576) * Prepare for release * version --- .../Azure.Messaging.EventGrid/CHANGELOG.md | 8 ++----- ...zure.Messaging.EventGrid.netstandard2.0.cs | 5 +++- .../src/Azure.Messaging.EventGrid.csproj | 2 +- .../Customization/EventGridModelFactory.cs | 23 +++++++++++++++++++ .../src/Generated/EventGridModelFactory.cs | 6 +++-- .../AcsIncomingCallEventData.Serialization.cs | 11 +++++++++ .../Models/AcsIncomingCallEventData.cs | 6 ++++- .../AcsMessageInteractiveListReplyContent.cs | 4 ++-- .../Azure.Messaging.EventGrid/src/autorest.md | 3 +-- 9 files changed, 53 insertions(+), 15 deletions(-) diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md b/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md index ea511e5679db8..630a8817606a9 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md @@ -1,14 +1,10 @@ # Release History -## 4.27.0-beta.1 (Unreleased) +## 4.27.0 (2024-10-14) ### Features Added -### Breaking Changes - -### Bugs Fixed - -### Other Changes +- Added `OnBehalfOfCallee` property to `AcsIncomingCallEventData` event. ## 4.26.0 (2024-09-18) diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/api/Azure.Messaging.EventGrid.netstandard2.0.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/api/Azure.Messaging.EventGrid.netstandard2.0.cs index d46b804bc7dee..b5a2de6e80e09 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/api/Azure.Messaging.EventGrid.netstandard2.0.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/api/Azure.Messaging.EventGrid.netstandard2.0.cs @@ -74,7 +74,9 @@ public static partial class EventGridModelFactory public static Azure.Messaging.EventGrid.SystemEvents.AcsEmailEngagementTrackingReportReceivedEventData AcsEmailEngagementTrackingReportReceivedEventData(string sender, string messageId, System.DateTimeOffset? userActionTimestamp, string engagementContext, string userAgent, Azure.Messaging.EventGrid.SystemEvents.AcsUserEngagement? engagement) { throw null; } public static Azure.Messaging.EventGrid.SystemEvents.AcsEmailEngagementTrackingReportReceivedEventData AcsEmailEngagementTrackingReportReceivedEventData(string sender = null, string recipient = null, string messageId = null, System.DateTimeOffset? userActionTimestamp = default(System.DateTimeOffset?), string engagementContext = null, string userAgent = null, Azure.Messaging.EventGrid.SystemEvents.AcsUserEngagement? engagement = default(Azure.Messaging.EventGrid.SystemEvents.AcsUserEngagement?)) { throw null; } public static Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallCustomContext AcsIncomingCallCustomContext(System.Collections.Generic.IReadOnlyDictionary sipHeaders = null, System.Collections.Generic.IReadOnlyDictionary voipHeaders = null) { throw null; } - public static Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallEventData AcsIncomingCallEventData(Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel toCommunicationIdentifier = null, Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel fromCommunicationIdentifier = null, string serverCallId = null, string callerDisplayName = null, Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallCustomContext customContext = null, string incomingCallContext = null, string correlationId = null) { throw null; } + public static Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallEventData AcsIncomingCallEventData(Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel toCommunicationIdentifier = null, Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel fromCommunicationIdentifier = null, string serverCallId = null, string callerDisplayName = null, Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallCustomContext customContext = null, string incomingCallContext = null, Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel onBehalfOfCallee = null, string correlationId = null) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public static Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallEventData AcsIncomingCallEventData(Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel toCommunicationIdentifier, Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel fromCommunicationIdentifier, string serverCallId, string callerDisplayName, Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallCustomContext customContext, string incomingCallContext, string correlationId) { throw null; } public static Azure.Messaging.EventGrid.SystemEvents.AcsMessageButtonContent AcsMessageButtonContent(string text = null, string payload = null) { throw null; } public static Azure.Messaging.EventGrid.SystemEvents.AcsMessageContext AcsMessageContext(string from = null, string messageId = null) { throw null; } public static Azure.Messaging.EventGrid.SystemEvents.AcsMessageInteractiveButtonReplyContent AcsMessageInteractiveButtonReplyContent(string buttonId = null, string title = null) { throw null; } @@ -1025,6 +1027,7 @@ internal AcsIncomingCallEventData() { } public Azure.Messaging.EventGrid.SystemEvents.AcsIncomingCallCustomContext CustomContext { get { throw null; } } public Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel FromCommunicationIdentifier { get { throw null; } } public string IncomingCallContext { get { throw null; } } + public Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel OnBehalfOfCallee { get { throw null; } } public string ServerCallId { get { throw null; } } public Azure.Messaging.EventGrid.SystemEvents.CommunicationIdentifierModel ToCommunicationIdentifier { get { throw null; } } } diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj index bd7df53da744a..a4e4c351d0a92 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Azure.Messaging.EventGrid.csproj @@ -2,7 +2,7 @@ This library can be used to publish events to Azure Event Grid and to consume events delivered by EventGrid. It also defines the event schemas for the events published to EventGrid by various Azure services. Microsoft Azure.Messaging.EventGrid client library - 4.27.0-beta.1 + 4.27.0 4.26.0 Microsoft Azure EventGrid;Event Grid;Event Grid Publishing; diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs index 66865ffa41acd..0a20091e92abd 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Customization/EventGridModelFactory.cs @@ -694,6 +694,29 @@ public static AcsRouterJobReceivedEventData AcsRouterJobReceivedEventData(string return new AcsRouterJobReceivedEventData(jobId, channelReference, channelId, queueId, labels, tags, status, classificationPolicyId, priority, requestedWorkerSelectors?.ToList(), scheduledOn, unavailableForMatching); } + /// Initializes a new instance of . + /// The communication identifier of the target user. + /// The communication identifier of the user who initiated the call. + /// The Id of the server call. + /// Display name of caller. + /// Custom Context of Incoming Call. + /// Signed incoming call context. + /// CorrelationId (CallId). + /// A new instance for mocking. + [EditorBrowsable(EditorBrowsableState.Never)] + public static AcsIncomingCallEventData AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier, CommunicationIdentifierModel fromCommunicationIdentifier, string serverCallId, string callerDisplayName, AcsIncomingCallCustomContext customContext, string incomingCallContext, string correlationId) + { + return new AcsIncomingCallEventData( + toCommunicationIdentifier, + fromCommunicationIdentifier, + serverCallId, + callerDisplayName, + customContext, + incomingCallContext, + default, + correlationId); + } + /// Initializes a new instance of ResourceNotificationsResourceUpdatedDetails. /// id of the resource for which the event is being emitted. /// name of the resource for which the event is being emitted. diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs index 02ef86bc66cab..36bbe3accadf9 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/EventGridModelFactory.cs @@ -2104,9 +2104,10 @@ public static WebAppServicePlanUpdatedEventDataSku WebAppServicePlanUpdatedEvent /// Display name of caller. /// Custom Context of Incoming Call. /// Signed incoming call context. + /// The communication identifier of the user on behalf of whom the call is made. /// CorrelationId (CallId). /// A new instance for mocking. - public static AcsIncomingCallEventData AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier = null, CommunicationIdentifierModel fromCommunicationIdentifier = null, string serverCallId = null, string callerDisplayName = null, AcsIncomingCallCustomContext customContext = null, string incomingCallContext = null, string correlationId = null) + public static AcsIncomingCallEventData AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier = null, CommunicationIdentifierModel fromCommunicationIdentifier = null, string serverCallId = null, string callerDisplayName = null, AcsIncomingCallCustomContext customContext = null, string incomingCallContext = null, CommunicationIdentifierModel onBehalfOfCallee = null, string correlationId = null) { return new AcsIncomingCallEventData( toCommunicationIdentifier, @@ -2115,6 +2116,7 @@ public static AcsIncomingCallEventData AcsIncomingCallEventData(CommunicationIde callerDisplayName, customContext, incomingCallContext, + onBehalfOfCallee, correlationId); } @@ -3534,7 +3536,7 @@ public static AcsMessageInteractiveButtonReplyContent AcsMessageInteractiveButto /// Initializes a new instance of . /// The ID of the selected list item. /// The title of the selected list item. - /// The sescription of the selected row. + /// The description of the selected row. /// A new instance for mocking. public static AcsMessageInteractiveListReplyContent AcsMessageInteractiveListReplyContent(string listItemId = null, string title = null, string description = null) { diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.Serialization.cs index b612c18397f32..dbd0f968eb7f1 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.Serialization.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.Serialization.cs @@ -26,6 +26,7 @@ internal static AcsIncomingCallEventData DeserializeAcsIncomingCallEventData(Jso string callerDisplayName = default; AcsIncomingCallCustomContext customContext = default; string incomingCallContext = default; + CommunicationIdentifierModel onBehalfOfCallee = default; string correlationId = default; foreach (var property in element.EnumerateObject()) { @@ -71,6 +72,15 @@ internal static AcsIncomingCallEventData DeserializeAcsIncomingCallEventData(Jso incomingCallContext = property.Value.GetString(); continue; } + if (property.NameEquals("onBehalfOfCallee"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + onBehalfOfCallee = CommunicationIdentifierModel.DeserializeCommunicationIdentifierModel(property.Value); + continue; + } if (property.NameEquals("correlationId"u8)) { correlationId = property.Value.GetString(); @@ -84,6 +94,7 @@ internal static AcsIncomingCallEventData DeserializeAcsIncomingCallEventData(Jso callerDisplayName, customContext, incomingCallContext, + onBehalfOfCallee, correlationId); } diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.cs index afef29bfb67e4..bfde5f5399b1d 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsIncomingCallEventData.cs @@ -22,8 +22,9 @@ internal AcsIncomingCallEventData() /// Display name of caller. /// Custom Context of Incoming Call. /// Signed incoming call context. + /// The communication identifier of the user on behalf of whom the call is made. /// CorrelationId (CallId). - internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier, CommunicationIdentifierModel fromCommunicationIdentifier, string serverCallId, string callerDisplayName, AcsIncomingCallCustomContext customContext, string incomingCallContext, string correlationId) + internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationIdentifier, CommunicationIdentifierModel fromCommunicationIdentifier, string serverCallId, string callerDisplayName, AcsIncomingCallCustomContext customContext, string incomingCallContext, CommunicationIdentifierModel onBehalfOfCallee, string correlationId) { ToCommunicationIdentifier = toCommunicationIdentifier; FromCommunicationIdentifier = fromCommunicationIdentifier; @@ -31,6 +32,7 @@ internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationId CallerDisplayName = callerDisplayName; CustomContext = customContext; IncomingCallContext = incomingCallContext; + OnBehalfOfCallee = onBehalfOfCallee; CorrelationId = correlationId; } @@ -46,6 +48,8 @@ internal AcsIncomingCallEventData(CommunicationIdentifierModel toCommunicationId public AcsIncomingCallCustomContext CustomContext { get; } /// Signed incoming call context. public string IncomingCallContext { get; } + /// The communication identifier of the user on behalf of whom the call is made. + public CommunicationIdentifierModel OnBehalfOfCallee { get; } /// CorrelationId (CallId). public string CorrelationId { get; } } diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsMessageInteractiveListReplyContent.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsMessageInteractiveListReplyContent.cs index 0ae51800a68b8..84d58f3c7f583 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsMessageInteractiveListReplyContent.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsMessageInteractiveListReplyContent.cs @@ -18,7 +18,7 @@ internal AcsMessageInteractiveListReplyContent() /// Initializes a new instance of . /// The ID of the selected list item. /// The title of the selected list item. - /// The sescription of the selected row. + /// The description of the selected row. internal AcsMessageInteractiveListReplyContent(string listItemId, string title, string description) { ListItemId = listItemId; @@ -30,7 +30,7 @@ internal AcsMessageInteractiveListReplyContent(string listItemId, string title, public string ListItemId { get; } /// The title of the selected list item. public string Title { get; } - /// The sescription of the selected row. + /// The description of the selected row. public string Description { get; } } } diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md b/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md index 93e46b27d82f6..da4fb78ad757e 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md @@ -4,7 +4,7 @@ Run `dotnet build /t:GenerateCode` to generate code. ``` yaml title: EventGridClient -require: https://github.com/Azure/azure-rest-api-specs/blob/6c709e5a3325eaa862649acee2252ce1c8166042/specification/eventgrid/data-plane/readme.md +require: https://github.com/Azure/azure-rest-api-specs/blob/012021c786c360e0c34faf7af888c7fd7dbe2df5/specification/eventgrid/data-plane/readme.md generation1-convenience-client: true model-factory-for-hlc: - MediaJobOutputAsset @@ -191,7 +191,6 @@ directive: - from: swagger-document where: $.definitions.MediaJobOutput transform: > - $.required.push("@odata.type"); $["x-csharp-usage"] = "model,output"; ```