Merge branch 'release-1.15' into release/bump-go

Author: mikeee

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

.github/env/global.env

@@ -1,5 +1,5 @@
-DAPR_CLI_VERSION: 1.14.1
-DAPR_RUNTIME_VERSION: 1.15.0-rc.2
+DAPR_CLI_VERSION: 1.15.0-rc.5
+DAPR_RUNTIME_VERSION: 1.15.0-rc.11
 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
 DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
 
@@ -11,4 +11,4 @@ GOVER: 1.22
 
 KUBERNETES_VERSION: v1.32.0
 KIND_VERSION: v0.26.0
-KIND_IMAGE_SHA: sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
+KIND_IMAGE_SHA: sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027

actors/csharp/sdk/README.md

@@ -13,7 +13,7 @@ Let's take a look at the Dapr [Actors building block](https://docs.dapr.io/devel
 For this example, you will need:
 
 - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
-- [.NET 7 SDK](https://dotnet.microsoft.com/download).
+- [.NET 8 SDK](https://dotnet.microsoft.com/download).
 - Docker Desktop
 
 ### Step 2: Set up the environment
@@ -34,7 +34,7 @@ Run the `SmartDevice.Service`, which will start service itself and the Dapr side
 <!-- STEP
 name: Run actor service
 expected_stdout_lines:
-  - "Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - 200"
+  - "Request finished HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - 200"
 expected_stderr_lines:
 working_dir: .
 output_match_mode: substring
@@ -50,14 +50,23 @@ dapr run --app-id actorservice --app-port 5001 --app-protocol http --dapr-http-p
 Expected output:
 
 ```bash
+== APP == info: Microsoft.Hosting.Lifetime[14]
+== APP ==       Now listening on: http://localhost:5001
+== APP == info: Microsoft.Hosting.Lifetime[0]
+== APP ==       Application started. Press Ctrl+C to shut down.
+== APP == info: Microsoft.Hosting.Lifetime[0]
+== APP ==       Hosting environment: Production
+== APP == info: Microsoft.Hosting.Lifetime[0]
 == APP == info: Microsoft.AspNetCore.Hosting.Diagnostics[1]
-== APP ==       Request starting HTTP/1.1 GET http://127.0.0.1:5001/healthz - -
+== APP ==       Request starting HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - application/json -
+== APP == warn: Microsoft.AspNetCore.HttpsPolicy.HttpsRedirectionMiddleware[3]
+== APP ==       Failed to determine the https port for redirect.
 == APP == info: Microsoft.AspNetCore.Routing.EndpointMiddleware[0]
-== APP ==       Executing endpoint 'Dapr Actors Health Check'
+== APP ==       Executing endpoint 'Dapr Actors Config'
 == APP == info: Microsoft.AspNetCore.Routing.EndpointMiddleware[1]
-== APP ==       Executed endpoint 'Dapr Actors Health Check'
+== APP ==       Executed endpoint 'Dapr Actors Config'
 == APP == info: Microsoft.AspNetCore.Hosting.Diagnostics[2]
-== APP ==       Request finished HTTP/1.1 GET http://127.0.0.1:5001/healthz - - - 200 - text/plain 5.2599ms
+== APP ==       Request finished HTTP/1.1 GET http://127.0.0.1:5001/dapr/config - 200 - application/json 30.6175ms
 ```
 
 ### Step 4: Run the client app

actors/csharp/sdk/client/SmartDevice.Client.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
+    <PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
   </ItemGroup>
 
   <ItemGroup>

actors/csharp/sdk/service/SmartDevice.Service.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
-    <PackageReference Include="Dapr.Actors.AspNetCore" Version="1.14.*-*" />
+    <PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
+    <PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.0-rc02" />
   </ItemGroup>
 
   <ItemGroup>

bindings/csharp/sdk/batch/batch.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
+      <PackageReference Include="Dapr.AspNetCore" Version="1.15.0-rc02" />
     </ItemGroup>
 
   </Project>

bindings/csharp/sdk/batch/program.cs

@@ -31,20 +31,21 @@ limitations under the License.
     options.SupportedCultures = [invariantCulture];
 });
 
+builder.Services.AddDaprClient();
+
 var app = builder.Build();
 
 if (app.Environment.IsDevelopment()) { app.UseDeveloperExceptionPage(); }
 
 app.UseRequestLocalization();
 
 // Triggered by Dapr input binding
-app.MapPost("/" + cronBindingName, async () =>
+app.MapPost("/" + cronBindingName, async (DaprClient client) =>
 {
     Console.WriteLine("Processing batch..");
 
     string jsonFile = File.ReadAllText("../../../orders.json");
     var ordersArray = JsonSerializer.Deserialize<Orders>(jsonFile);
-    using var client = new DaprClientBuilder().Build();
     foreach (Order ord in ordersArray?.orders ?? new Order[] { })
     {
         var sqlText = $"insert into orders (orderid, customer, price) values ({ord.OrderId}, '{ord.Customer}', {ord.Price});";
@@ -65,5 +66,5 @@ limitations under the License.
 
 await app.RunAsync();
 
-public record Order([property: JsonPropertyName("orderid")] int OrderId, [property: JsonPropertyName("customer")] string Customer, [property: JsonPropertyName("price")] float Price);
-public record Orders([property: JsonPropertyName("orders")] Order[] orders);
+public sealed record Order([property: JsonPropertyName("orderid")] int OrderId, [property: JsonPropertyName("customer")] string Customer, [property: JsonPropertyName("price")] float Price);
+public sealed record Orders([property: JsonPropertyName("orders")] Order[] orders);

bindings/python/sdk/batch/requirements.txt

@@ -1,3 +1,4 @@
-dapr>=1.14.0a,<1.15.0
+dapr>=1.15.0rc2
 Flask
-typing-extensions
+typing-extensions
+werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability

configuration/python/http/order-processor/requirements.txt

@@ -1,2 +1,3 @@
 requests
-flask
+flask
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability

configuration/python/sdk/order-processor/requirements.txt

@@ -1,2 +1,2 @@
-dapr>=1.14.0a,<1.15.0
+dapr>=1.15.0rc2
 typing-extensions