From d220d5b460ddd2c3fa05027ccaf9ff7277ce22b6 Mon Sep 17 00:00:00 2001 From: JoshLove-msft <54595583+JoshLove-msft@users.noreply.github.com> Date: Fri, 12 Jul 2024 10:33:15 -0700 Subject: [PATCH] Prepare for release (#44982) --- sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md | 8 ++------ .../src/Azure.Messaging.EventGrid.csproj | 2 +- ...ailDeliveryReportReceivedEventData.Serialization.cs | 8 ++++---- ...entTrackingReportReceivedEventData.Serialization.cs | 8 ++++---- .../Azure.Messaging.EventGrid/src/autorest.md | 2 +- .../tests/ConsumeEventTests.cs | 10 +++++----- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md b/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md index 0f2eb98f42af4..08a8cccf37cb5 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/CHANGELOG.md @@ -1,14 +1,10 @@ # Release History -## 4.25.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes +## 4.24.1 (2024-07-16) ### Bugs Fixed -### Other Changes +- Fixed deserialization bugs in `AcsEmailEngagementTrackingReportReceivedEventData` and `AcsEmailDeliveryReportReceivedEventData` system events that caused the `DeliveryAttemptTimestamp` and `UserActionTimeStamp` properties to be null. ## 4.24.0 (2024-04-09) 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 045512770fc82..8eb6a0f9713f7 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.25.0-beta.1 + 4.24.1 4.24.0 Microsoft Azure EventGrid;Event Grid;Event Grid Publishing; diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailDeliveryReportReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailDeliveryReportReceivedEventData.Serialization.cs index 2ca8d3672fd41..58731f08f414d 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailDeliveryReportReceivedEventData.Serialization.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailDeliveryReportReceivedEventData.Serialization.cs @@ -25,7 +25,7 @@ internal static AcsEmailDeliveryReportReceivedEventData DeserializeAcsEmailDeliv string messageId = default; AcsEmailDeliveryReportStatus? status = default; AcsEmailDeliveryReportStatusDetails deliveryStatusDetails = default; - DateTimeOffset? deliveryAttemptTimeStamp = default; + DateTimeOffset? deliveryAttemptTimestamp = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("sender"u8)) @@ -61,13 +61,13 @@ internal static AcsEmailDeliveryReportReceivedEventData DeserializeAcsEmailDeliv deliveryStatusDetails = AcsEmailDeliveryReportStatusDetails.DeserializeAcsEmailDeliveryReportStatusDetails(property.Value); continue; } - if (property.NameEquals("deliveryAttemptTimeStamp"u8)) + if (property.NameEquals("deliveryAttemptTimestamp"u8)) { if (property.Value.ValueKind == JsonValueKind.Null) { continue; } - deliveryAttemptTimeStamp = property.Value.GetDateTimeOffset("O"); + deliveryAttemptTimestamp = property.Value.GetDateTimeOffset("O"); continue; } } @@ -77,7 +77,7 @@ internal static AcsEmailDeliveryReportReceivedEventData DeserializeAcsEmailDeliv messageId, status, deliveryStatusDetails, - deliveryAttemptTimeStamp); + deliveryAttemptTimestamp); } /// Deserializes the model from a raw response. diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs index 0b948cc83358e..5e94fe7309f16 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/src/Generated/Models/AcsEmailEngagementTrackingReportReceivedEventData.Serialization.cs @@ -23,7 +23,7 @@ internal static AcsEmailEngagementTrackingReportReceivedEventData DeserializeAcs string sender = default; string recipient = default; string messageId = default; - DateTimeOffset? userActionTimeStamp = default; + DateTimeOffset? userActionTimestamp = default; string engagementContext = default; string userAgent = default; AcsUserEngagement? engagementType = default; @@ -44,13 +44,13 @@ internal static AcsEmailEngagementTrackingReportReceivedEventData DeserializeAcs messageId = property.Value.GetString(); continue; } - if (property.NameEquals("userActionTimeStamp"u8)) + if (property.NameEquals("userActionTimestamp"u8)) { if (property.Value.ValueKind == JsonValueKind.Null) { continue; } - userActionTimeStamp = property.Value.GetDateTimeOffset("O"); + userActionTimestamp = property.Value.GetDateTimeOffset("O"); continue; } if (property.NameEquals("engagementContext"u8)) @@ -77,7 +77,7 @@ internal static AcsEmailEngagementTrackingReportReceivedEventData DeserializeAcs sender, recipient, messageId, - userActionTimeStamp, + userActionTimestamp, engagementContext, userAgent, engagementType); diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md b/sdk/eventgrid/Azure.Messaging.EventGrid/src/autorest.md index 6d14ef9ad6a6c..0a5b3d31756e0 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/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/readme.md +require: https://github.com/Azure/azure-rest-api-specs/blob/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/readme.md generation1-convenience-client: true model-factory-for-hlc: - MediaJobOutputAsset diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid/tests/ConsumeEventTests.cs b/sdk/eventgrid/Azure.Messaging.EventGrid/tests/ConsumeEventTests.cs index 53552c7eb3b23..1947755f7bc58 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid/tests/ConsumeEventTests.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid/tests/ConsumeEventTests.cs @@ -1799,7 +1799,7 @@ public void ConsumeAcsEmailDeliveryReportReceivedEvent() ""recipient"": ""test1@contoso.com"", ""messageId"": ""950850f5-bcdf-4315-b77a-6447cf56fac9"", ""status"": ""delivered"", - ""deliveryAttemptTimeStamp"": ""2023-02-09T19:46:12.2480265+00:00"", + ""deliveryAttemptTimestamp"": ""2023-02-09T19:46:12.2480265+00:00"", ""deliveryStatusDetails"": { ""statusMessage"": ""DestinationMailboxFull"" } @@ -1944,7 +1944,7 @@ public void ConsumeDicomImageCreatedEvent() ""subject"": ""{dicom-account}.dicom.azurehealthcareapis.com/v1/studies/1.2.3.4.3/series/1.2.3.4.3.9423673/instances/1.3.6.1.4.1.45096.2.296485376.2210.1633373143.864442"", ""eventType"": ""Microsoft.HealthcareApis.DicomImageCreated"", ""dataVersion"": ""1"", - ""metadataVersion"": ""1"", + ""metadataVersion"": ""1"", ""eventTime"": ""2022-09-15T01:14:04.5613214Z"", ""id"": ""d621839d-958b-4142-a638-bb966b4f7dfd"", ""data"": { @@ -1978,7 +1978,7 @@ public void ConsumeDicomImageUpdatedEvent() ""subject"": ""{dicom-account}.dicom.azurehealthcareapis.com/v1/studies/1.2.3.4.3/series/1.2.3.4.3.9423673/instances/1.3.6.1.4.1.45096.2.296485376.2210.1633373143.864442"", ""eventType"": ""Microsoft.HealthcareApis.DicomImageUpdated"", ""dataVersion"": ""1"", - ""metadataVersion"": ""1"", + ""metadataVersion"": ""1"", ""eventTime"": ""2022-09-15T01:14:04.5613214Z"", ""id"": ""d621839d-958b-4142-a638-bb966b4f7dfd"", ""data"": { @@ -2012,7 +2012,7 @@ public void ConsumeDicomImageDeletedEvent() ""subject"": ""{dicom-account}.dicom.azurehealthcareapis.com/v1/studies/1.2.3.4.3/series/1.2.3.4.3.9423673/instances/1.3.6.1.4.1.45096.2.296485376.2210.1633373143.864442"", ""eventType"": ""Microsoft.HealthcareApis.DicomImageDeleted"", ""dataVersion"": ""1"", - ""metadataVersion"": ""1"", + ""metadataVersion"": ""1"", ""eventTime"": ""2022-09-15T01:14:04.5613214Z"", ""id"": ""d621839d-958b-4142-a638-bb966b4f7dfd"", ""data"": { @@ -3689,7 +3689,7 @@ public void ConsumeCloudEventAcsEmailDeliveryReportReceivedEvent() ""deliveryStatusDetails"": { ""statusMessage"": ""DestinationMailboxFull"" }, - ""deliveryAttemptTimeStamp"": ""2023-02-09T19:46:12.2480265+00:00"" + ""deliveryAttemptTimestamp"": ""2023-02-09T19:46:12.2480265+00:00"" }, ""type"": ""Microsoft.Communication.EmailDeliveryReportReceived"", ""time"": ""2023-02-09T19:46:12.2478002Z"",