Merge pull request #278734 from spelluru/egridpullqs0619

Updated the code to latest, images, text

Author: Stacyrch140

articles/event-grid/event-grid-dotnet-get-started-pull-delivery.md

@@ -8,7 +8,7 @@ ms.custom:
   - references_regions
   - devx-track-dotnet
   - ignite-2023
-ms.date: 11/15/2023
+ms.date: 06/19/2024
 ---
 
 
@@ -31,7 +31,7 @@ In this quickstart, you do the following steps:
 If you're new to the service, see [Event Grid overview](overview.md) before you do this quickstart.
 
 - **Azure subscription**. To use Azure services, including Azure Event Grid, you need a subscription. If you don't have an existing Azure account, you can sign up for a [free trial](https://azure.microsoft.com/free/dotnet).
-- **Visual Studio 2022**. The sample application makes use of new features that were introduced in C# 10.  To use the latest syntax, we recommend that you install .NET 6.0, or higher and set the language version to `latest`. If you're using Visual Studio, versions before Visual Studio 2022 aren't compatible with the tools needed to build C# 10 projects.
+- **Visual Studio 2022**. The sample application makes use of new features that were introduced in C# 10. To use the latest syntax, we recommend that you install .NET 6.0, or higher and set the language version to `latest`. If you're using Visual Studio, versions before Visual Studio 2022 aren't compatible with the tools needed to build C# 10 projects.
 
 [!INCLUDE [event-grid-create-namespace-portal](./includes/event-grid-create-namespace-portal.md)]
 
@@ -43,8 +43,6 @@ If you're new to the service, see [Event Grid overview](overview.md) before you
 
 ## Launch Visual Studio
 
-You can authorize access to the Event Grid namespace using the following steps:
-
 Launch Visual Studio. If you see the **Get started** window, select the **Continue without code** link in the right pane.
 
 
@@ -73,7 +71,7 @@ This section shows you how to create a .NET console application to send messages
 2. Run the following command to install the **Azure.Messaging.EventGrid** NuGet package:
 
     ```powershell
-    Install-Package Azure.Messaging.EventGrid -version 4.22.0-beta.1
+    Install-Package Azure.Messaging.EventGrid.Namespaces
     ```
 
 
@@ -82,31 +80,36 @@ This section shows you how to create a .NET console application to send messages
 1. Replace the contents of `Program.cs` with the following code. The important steps are outlined,  with additional information in the code comments.
 
     > [!IMPORTANT]
-    > Update placeholder values (`<ENDPOINT>` , `<TOPIC-NAME>`, `<TOPIC-ACCESS-KEY>`, `<TOPIC-SUBSCRIPTION-NAME>`) in the code snippet with your topic endpoint, topic name, topic key, topic's subscription name.
+    > Update placeholder values (`<NAMESPACE-ENDPOINT>` , `<TOPIC-NAME>`, `<TOPIC-ACCESS-KEY>`, `<TOPIC-SUBSCRIPTION-NAME>`) in the code snippet with your namespace endpoint, topic name, and topic key.
 
     ```csharp
     using Azure.Messaging;
     using Azure;
-    using Azure.Messaging.EventGrid.Namespaces;    
+    using Azure.Messaging.EventGrid.Namespaces;
     
-    // TODO: Replace the <ENDPOINT> , <TOPIC-KEY> and <TOPIC-NAME> placeholder
     
-    var topicEndpoint = "<TOPIC-ENDPOINT>"; // Should be in the form: https://namespace01.eastus-1.eventgrid.azure.net. 
-    var topicKey = "<TOPIC-ACCESS-KEY>";
+    // TODO: Replace the following placeholders with appropriate values
+    
+    // Endpoint of the namespace that you can find on the Overview page for your Event Grid namespace. Prefix it with https://.
+    // Should be in the form: https://namespace01.eastus-1.eventgrid.azure.net. 
+    var namespaceEndpoint = "<NAMESPACE-ENDPOINT>";
+    
+    // Name of the topic in the namespace
     var topicName = "<TOPIC-NAME>";
-    var subscription = "<TOPIC-SUBSCRIPTION-NAME>";
-
+    
+    // Access key for the topic
+    var topicKey = "<TOPIC-ACCESS-KEY>";
+    
     // Construct the client using an Endpoint for a namespace as well as the access key
-    var client = new EventGridClient(new Uri(topicEndpoint), new AzureKeyCredential(topicKey));
+    var client = new EventGridSenderClient(new Uri(namespaceEndpoint), topicName, new AzureKeyCredential(topicKey));
     
     // Publish a single CloudEvent using a custom TestModel for the event data.
     var @ev = new CloudEvent("employee_source", "type", new TestModel { Name = "Bob", Age = 18 });
-    await client.PublishCloudEventAsync(topicName, ev);
+    await client.SendAsync(ev);
     
     // Publish a batch of CloudEvents.
     
-    await client.PublishCloudEventsAsync(
-    topicName,
+    await client.SendAsync(
     new[] {
         new CloudEvent("employee_source", "type", new TestModel { Name = "Tom", Age = 55 }),
         new CloudEvent("employee_source", "type", new TestModel { Name = "Alice", Age = 25 })});
@@ -118,7 +121,7 @@ This section shows you how to create a .NET console application to send messages
     {
         public string Name { get; set; }
         public int Age { get; set; }
-    }    
+    }
     
     ```
 2. Build the project, and ensure that there are no errors.
@@ -156,7 +159,7 @@ In this section, you create a .NET console application that receives messages fr
 1. Run the following command to install the **Azure.Messaging.EventGrid** NuGet package. Select **EventReceiver** for the **Default project** if it's not already set.
 
     ```powershell
-    Install-Package Azure.Messaging.EventGrid -version 4.22.0-beta.1
+    Install-Package Azure.Messaging.EventGrid.Namespaces
     ```
 
     :::image type="content" source="./media/event-grid-dotnet-get-started-events/install-event-grid-package.png" alt-text="Screenshot showing EventReceiver project selected in the Package Manager Console.":::
@@ -168,23 +171,36 @@ In this section, you add code to retrieve messages from the queue.
 1. Within the `Program` class, add the following code:
     
     > [!IMPORTANT]
-    > Update placeholder values (`<ENDPOINT>` , `<TOPIC-NAME>`, `<TOPIC-ACCESS-KEY>`, `<TOPIC-SUBSCRIPTION-NAME>`) in the code snippet with your topic endpoint, topic name, topic key, topic's subscription name.
+    > Update placeholder values (`<NAMESPACE-ENDPOINT>` , `<TOPIC-NAME>`, `<TOPIC-ACCESS-KEY>`, `<TOPIC-SUBSCRIPTION-NAME>`) in the code snippet with your namespace endpoint, topic name, topic key, topic's subscription name.
 
     ```csharp
     using Azure;
     using Azure.Messaging;
     using Azure.Messaging.EventGrid.Namespaces;
     
-    var topicEndpoint = "<TOPIC-ENDPOINT>"; // Should be in the form: https://namespace01.eastus-1.eventgrid.azure.net. 
-    var topicKey = "<TOPIC-ACCESS-KEY>";
+    // TODO: Replace the following placeholders with appropriate values
+    
+    // Endpoint of the namespace that you can find on the Overview page for your Event Grid namespace
+    // Example: https://namespace01.eastus-1.eventgrid.azure.net. 
+    var namespaceEndpoint = "<NAMESPACE-ENDPOINT>"; // Should be in the form: https://namespace01.eastus-1.eventgrid.azure.net. 
+    
+    // Name of the topic in the namespace
     var topicName = "<TOPIC-NAME>";
-    var subscription = "<TOPIC-SUBSCRIPTION-NAME>";
-
-    // Construct the client using an Endpoint for a namespace as well as the access key
-    var client = new EventGridClient(new Uri(topicEndpoint), new AzureKeyCredential(topicKey));
     
-    // Receive the published CloudEvents
-    ReceiveResult result = await client.ReceiveCloudEventsAsync(topicName, subscription, 3);
+    // Access key for the topic
+    var topicKey = "<TOPIC-ACCESS-KEY>";
+    
+    // Name of the subscription to the topic
+    var subscriptionName = "<TOPIC-SUBSCRIPTION-NAME>";
+    
+    // Maximum number of events you want to receive
+    const short MaxEventCount = 3;
+    
+    // Construct the client using an Endpoint for a namespace as well as the access key
+    var client = new EventGridReceiverClient(new Uri(namespaceEndpoint), topicName, subscriptionName, new AzureKeyCredential(topicKey));
+        
+    // Receive the published CloudEvents. 
+    ReceiveResult result = await client.ReceiveAsync(MaxEventCount);
     
     Console.WriteLine("Received Response");
     Console.WriteLine("-----------------");
@@ -195,14 +211,14 @@ In this section, you add code to retrieve messages from the queue.
 
     ```csharp
     // handle received messages. Define these variables on the top.
-    
+
     var toRelease = new List<string>();
     var toAcknowledge = new List<string>();
     var toReject = new List<string>();
     
     // Iterate through the results and collect the lock tokens for events we want to release/acknowledge/result
     
-    foreach (ReceiveDetails detail in result.Value)
+    foreach (ReceiveDetails detail in result.Details)
     {
         CloudEvent @event = detail.Event;
         BrokerProperties brokerProperties = detail.BrokerProperties;
@@ -233,7 +249,7 @@ In this section, you add code to retrieve messages from the queue.
     
     if (toRelease.Count > 0)
     {
-        ReleaseResult releaseResult = await client.ReleaseCloudEventsAsync(topicName, subscription, new ReleaseOptions(toRelease));
+        ReleaseResult releaseResult = await client.ReleaseAsync(toRelease);
     
         // Inspect the Release result
         Console.WriteLine($"Failed count for Release: {releaseResult.FailedLockTokens.Count}");
@@ -254,7 +270,7 @@ In this section, you add code to retrieve messages from the queue.
     
     if (toAcknowledge.Count > 0)
     {
-        AcknowledgeResult acknowledgeResult = await client.AcknowledgeCloudEventsAsync(topicName, subscription, new AcknowledgeOptions(toAcknowledge));
+        AcknowledgeResult acknowledgeResult = await client.AcknowledgeAsync(toAcknowledge);
     
         // Inspect the Acknowledge result
         Console.WriteLine($"Failed count for Acknowledge: {acknowledgeResult.FailedLockTokens.Count}");
@@ -275,7 +291,7 @@ In this section, you add code to retrieve messages from the queue.
     
     if (toReject.Count > 0)
     {
-        RejectResult rejectResult = await client.RejectCloudEventsAsync(topicName, subscription, new RejectOptions(toReject));
+        RejectResult rejectResult = await client.RejectAsync(toReject);
     
         // Inspect the Reject result
         Console.WriteLine($"Failed count for Reject: {rejectResult.FailedLockTokens.Count}");
@@ -299,7 +315,13 @@ In this section, you add code to retrieve messages from the queue.
         public string Name { get; set; }
         public int Age { get; set; }
     }    
+   
     ```
+1. In the **Solution Explorer** window, right-click **EventReceiver** project, and select **Set as Startup project**. 
+1. Build the project, and ensure that there are no errors.
+1. Run the **EventReceiver** application and confirmation you see the three events in the output window.
+
+    :::image type="content" source="./media/event-grid-dotnet-get-started-events/receive-output.png" alt-text="Screenshot showing the output from the Receiver app." lightbox="./media/event-grid-dotnet-get-started-events/receive-output.png":::
 
 ## Clean up resources
 

articles/event-grid/includes/event-grid-create-event-subscriptions-portal.md

@@ -1,25 +1,31 @@
 ---
- title: include file
- description: include file
+ title: Create a subscription to an Event Grid namespace topic
+ description: Include file with steps to create a subscription to an Azure Event Grid namespace topic. 
  services: event-grid
  author: sonalika-roy
  ms.service: event-grid
  ms.topic: include
- ms.date: 05/30/20223
+ ms.date: 06/19/2024
  ms.author: sonalikaroy
  ms.custom: include file
 ---
 
 ## Create an event subscription
 
 1. If you are on the **Topics** page of your Event Grid namespace in the Azure portal, select your topic from the list of topics. If you are on the **Topics** page, follow instructions from [create, view, and manage a namespace topics](../create-view-manage-namespace-topics.md) to identify the topic you want to use to create the event subscription.
-2. On the **Event Gird Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
-3. On the **Subscriptions** page, select "**+ Subscription**" button on the command bar.
 
-    :::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create.png" alt-text="Screenshot showing Event Grid event subscription create.":::
-4. In the **Basics** tab, type the name of the topic you want to create, and then select **Next: Filters** at the bottom of the page.
+    :::image type="content" source="../media/create-view-manage-event-subscriptions/select-topic.png" alt-text="Screenshot showing Event Grid topics page with a topic selected." lightbox="../media/create-view-manage-event-subscriptions/select-topic.png":::
+1. On the **Event Gird Namespace Topic** page, select **Subscriptions** option in the **Entities** section on the left menu.
+1. On the **Subscriptions** page, select "**+ Subscription**" button on the command bar.
 
-    :::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create-basics.png" alt-text="Screenshot showing Event Grid event subscription create basics.":::
+    :::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create.png" alt-text="Screenshot showing Event Grid event subscription create." lightbox="../media/create-view-manage-event-subscriptions/event-subscription-create.png":::
+4. In the **Basics** tab, follow these steps:
+    1. Enter a **name for the subscription** you want to create
+    1. Confirm that the **delivery schema** is set **Cloud Events v1.0**.
+    1. Confirm that the **delivery mode** is set to **Queue** (pull mode).
+    1. Select **Next: Filters** at the bottom of the page.
+
+        :::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create-basics.png" alt-text="Screenshot showing Event Grid event subscription create basics.":::
 5. In the **Filters** tab, add the names of the event types you want to filter in the subscription and add context attribute filters you want to use in the subscription. Then, select **Next: Additional features** at the bottom of the page.
 
     :::image type="content" source="../media/create-view-manage-event-subscriptions/event-subscription-create-filters.png" alt-text="Screenshot showing Event Grid event subscription create filters.":::

articles/event-grid/includes/event-grid-create-namespace-topic-portal.md

@@ -12,7 +12,7 @@
 
 ## Create a namespace topic
 
-1. If you are not on the Event Grid Namespace page, follow the [create, view and manage namespaces](../create-view-manage-namespaces.md) steps to view the namespace you want to use to create the topic.
+1. If you aren't on the Event Grid Namespace page, follow the [create, view, and manage namespaces](../create-view-manage-namespaces.md) steps to view the namespace you want to use to create the topic.
 2. On the **Event Grid Namespace** page, select **Topics** option in the **Eventing** section on the left menu.
 3. On the **Topics** page, select **+ Topic** button on the command bar.