Merge pull request #1145 from paulyuk/release-1.15

Merge changes from master to release-1.15 branch
dapr · Jan 24, 2025 · 7dfc415 · 7dfc415
2 parents 7830ad8 + 988bde6
commit 7dfc415
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 13 deletions.
diff --git a/actors/csharp/sdk/README.md b/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

diff --git a/actors/csharp/sdk/client/SmartDevice.Client.csproj b/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>

diff --git a/actors/csharp/sdk/service/SmartDevice.Service.csproj b/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>

diff --git a/bindings/csharp/sdk/batch/batch.csproj b/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>
diff --git a/bindings/csharp/sdk/batch/program.cs b/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);
diff --git a/bindings/python/sdk/batch/requirements.txt b/bindings/python/sdk/batch/requirements.txt
@@ -1,3 +1,4 @@
 dapr>=1.14.0a,<1.15.0
 Flask
-typing-extensions
+typing-extensions
+werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/cryptography/python/sdk/README.md b/cryptography/python/sdk/README.md
@@ -60,7 +60,7 @@ expected_stdout_lines:
   - '== APP == Encrypted the message, got 856 bytes'
   - '== APP == Decrypted the message, got 24 bytes'
   - '== APP == The secret is "passw0rd"'
-  - '== APP == Wrote encrypted data to encrypted.out'
+  - '== APP == Wrote decrypted data to encrypted.out'
   - '== APP == Wrote decrypted data to decrypted.out.jpg'
   - "Exited App successfully"
 expected_stderr_lines:

diff --git a/pub_sub/python/http/order-processor/requirements.txt b/pub_sub/python/http/order-processor/requirements.txt
@@ -1,3 +1,4 @@
 Flask
 dapr
 cloudevents
+werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/service_invocation/python/http/order-processor/requirements.txt b/service_invocation/python/http/order-processor/requirements.txt
@@ -1,3 +1,4 @@
 Flask
 dapr
-typing-extensions
+typing-extensions
+werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/state_management/python/http/order-processor/requirements.txt b/state_management/python/http/order-processor/requirements.txt
@@ -1 +1,2 @@
 requests
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/tutorials/pub-sub/python-subscriber/requirements.txt b/tutorials/pub-sub/python-subscriber/requirements.txt
@@ -2,7 +2,7 @@ Click==7.0
 Flask==1.1.1
 Flask-Cors==3.0.9
 itsdangerous==1.1.0
-Jinja2==2.11.3
+Jinja2==3.1.4
 MarkupSafe==1.1.1
 six==1.12.0
 Werkzeug==0.15.6
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		requests
		urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability