Skip to content

Commit 7dfc415

Browse files
authored
Merge pull request dapr#1145 from paulyuk/release-1.15
Merge changes from master to release-1.15 branch
2 parents 7830ad8 + 988bde6 commit 7dfc415

File tree

11 files changed

+18
-13
lines changed

11 files changed

+18
-13
lines changed

actors/csharp/sdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Let's take a look at the Dapr [Actors building block](https://docs.dapr.io/devel
1313
For this example, you will need:
1414

1515
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
16-
- [.NET 7 SDK](https://dotnet.microsoft.com/download).
16+
- [.NET 8 SDK](https://dotnet.microsoft.com/download).
1717
- Docker Desktop
1818

1919
### Step 2: Set up the environment

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
11+
<PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Dapr.Actors" Version="1.14.*-*" />
11-
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.14.*-*" />
10+
<PackageReference Include="Dapr.Actors" Version="1.15.0-rc02" />
11+
<PackageReference Include="Dapr.Actors.AspNetCore" Version="1.15.0-rc02" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

bindings/csharp/sdk/batch/batch.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Dapr.AspNetCore" Version="1.14.*-*" />
11+
<PackageReference Include="Dapr.AspNetCore" Version="1.15.0-rc02" />
1212
</ItemGroup>
1313

1414
</Project>

bindings/csharp/sdk/batch/program.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,21 @@ limitations under the License.
3131
options.SupportedCultures = [invariantCulture];
3232
});
3333

34+
builder.Services.AddDaprClient();
35+
3436
var app = builder.Build();
3537

3638
if (app.Environment.IsDevelopment()) { app.UseDeveloperExceptionPage(); }
3739

3840
app.UseRequestLocalization();
3941

4042
// Triggered by Dapr input binding
41-
app.MapPost("/" + cronBindingName, async () =>
43+
app.MapPost("/" + cronBindingName, async (DaprClient client) =>
4244
{
4345
Console.WriteLine("Processing batch..");
4446

4547
string jsonFile = File.ReadAllText("../../../orders.json");
4648
var ordersArray = JsonSerializer.Deserialize<Orders>(jsonFile);
47-
using var client = new DaprClientBuilder().Build();
4849
foreach (Order ord in ordersArray?.orders ?? new Order[] { })
4950
{
5051
var sqlText = $"insert into orders (orderid, customer, price) values ({ord.OrderId}, '{ord.Customer}', {ord.Price});";
@@ -65,5 +66,5 @@ limitations under the License.
6566

6667
await app.RunAsync();
6768

68-
public record Order([property: JsonPropertyName("orderid")] int OrderId, [property: JsonPropertyName("customer")] string Customer, [property: JsonPropertyName("price")] float Price);
69-
public record Orders([property: JsonPropertyName("orders")] Order[] orders);
69+
public sealed record Order([property: JsonPropertyName("orderid")] int OrderId, [property: JsonPropertyName("customer")] string Customer, [property: JsonPropertyName("price")] float Price);
70+
public sealed record Orders([property: JsonPropertyName("orders")] Order[] orders);
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dapr>=1.14.0a,<1.15.0
22
Flask
3-
typing-extensions
3+
typing-extensions
4+
werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability

cryptography/python/sdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ expected_stdout_lines:
6060
- '== APP == Encrypted the message, got 856 bytes'
6161
- '== APP == Decrypted the message, got 24 bytes'
6262
- '== APP == The secret is "passw0rd"'
63-
- '== APP == Wrote encrypted data to encrypted.out'
63+
- '== APP == Wrote decrypted data to encrypted.out'
6464
- '== APP == Wrote decrypted data to decrypted.out.jpg'
6565
- "Exited App successfully"
6666
expected_stderr_lines:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Flask
22
dapr
33
cloudevents
4+
werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Flask
22
dapr
3-
typing-extensions
3+
typing-extensions
4+
werkzeug>=3.0.3 # not directly required, pinned by Snyk to avoid a vulnerability
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
requests
2+
urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability

0 commit comments

Comments
 (0)