Finalizing dapr fixes (dotnet#756)

jkotalik · web-flow · commit fae47325b0c8 · 2020-11-05T11:24:57.000-08:00
diff --git a/samples/dapr/orders/Controllers/OrdersController.cs b/samples/dapr/orders/Controllers/OrdersController.cs
@@ -10,7 +10,7 @@ namespace orders.Controllers
     [ApiController]
     public class OrdersController : ControllerBase
     {
-        [Topic("orderplaced")]
+        [Topic("messagebus", "orderplaced")]
         [HttpPost("orderplaced")]
         public async Task PlaceOrder(Order order, [FromServices] DaprClient dapr, [FromServices] ILogger<OrdersController> logger)
         {
@@ -49,7 +49,7 @@ public async Task PlaceOrder(Order order, [FromServices] DaprClient dapr, [FromS
                 };
             }
 
-            await dapr.PublishEventAsync("orderprocessed", confirmation);
+            await dapr.PublishEventAsync("messagebus", "orderprocessed", confirmation);
 
             logger.LogInformation("Sent confirmation for order {OrderId}", order.OrderId);
 
diff --git a/samples/dapr/orders/orders.csproj b/samples/dapr/orders/orders.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="0.8.0-preview01" />
+    <PackageReference Include="Dapr.AspNetCore" Version="0.11.0-preview02" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/dapr/products/products.csproj b/samples/dapr/products/products.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="0.8.0-preview01" />
+    <PackageReference Include="Dapr.AspNetCore" Version="0.11.0-preview02" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/dapr/store/Shared/ProductDisplay.razor b/samples/dapr/store/Shared/ProductDisplay.razor
@@ -46,7 +46,7 @@
 
             var task = Broker.GetOrderConfirmationAsync(orderId, cts.Token);
 
-            await Dapr.PublishEventAsync("orderplaced", new Order()
+            await Dapr.PublishEventAsync("messagebus", "orderplaced", new Order()
             {
                 ProductId = Product.Id,
                 OrderId = orderId,
diff --git a/samples/dapr/store/Startup.cs b/samples/dapr/store/Startup.cs
@@ -1,6 +1,7 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -63,9 +64,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 var broker = endpoints.ServiceProvider.GetRequiredService<OrdersEventBroker>();
                 endpoints.MapPost("/orderprocessed", async context =>
                 {
-                    var confirmation = await JsonSerializer.DeserializeAsync<OrderConfirmation>(context.Request.Body);
+                    var confirmation = await JsonSerializer.DeserializeAsync<OrderConfirmation>(context.Request.Body, new JsonSerializerOptions()
+                    {
+                        PropertyNameCaseInsensitive = true
+                    });
                     broker.Complete(confirmation);
-                }).WithTopic("orderprocessed");
+                }).WithTopic("messagebus", "orderprocessed");
             });
         }
     }
diff --git a/samples/dapr/store/store.csproj b/samples/dapr/store/store.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="0.8.0-preview01" />
+    <PackageReference Include="Dapr.AspNetCore" Version="0.11.0-preview02" />
   </ItemGroup>
   
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace orders.Controllers`
`10`	`10`	`[ApiController]`
`11`	`11`	`public class OrdersController : ControllerBase`
`12`	`12`	`{`
`13`		`- [Topic("orderplaced")]`
	`13`	`+ [Topic("messagebus", "orderplaced")]`
`14`	`14`	`[HttpPost("orderplaced")]`
`15`	`15`	`public async Task PlaceOrder(Order order, [FromServices] DaprClient dapr, [FromServices] ILogger<OrdersController> logger)`
`16`	`16`	`{`
`@@ -49,7 +49,7 @@ public async Task PlaceOrder(Order order, [FromServices] DaprClient dapr, [FromS`
`49`	`49`	`};`
`50`	`50`	`}`
`51`	`51`
`52`		`- await dapr.PublishEventAsync("orderprocessed", confirmation);`
	`52`	`+ await dapr.PublishEventAsync("messagebus", "orderprocessed", confirmation);`
`53`	`53`
`54`	`54`	`logger.LogInformation("Sent confirmation for order {OrderId}", order.OrderId);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`
`47`	`47`	`var task = Broker.GetOrderConfirmationAsync(orderId, cts.Token);`
`48`	`48`
`49`		`- await Dapr.PublishEventAsync("orderplaced", new Order()`
	`49`	`+ await Dapr.PublishEventAsync("messagebus", "orderplaced", new Order()`
`50`	`50`	`{`
`51`	`51`	`ProductId = Product.Id,`
`52`	`52`	`OrderId = orderId,`