Skip to content

Commit 74f6b01

Browse files
authored
Merge 1.14 release branch back into master. (#1337)
1 parent b8e2767 commit 74f6b01

File tree

11 files changed

+212
-31
lines changed

11 files changed

+212
-31
lines changed

.devcontainer/localinit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ az extension add --name containerapp --yes
66
nvm install v18.12.1
77

88
# initialize Dapr
9-
dapr init --runtime-version=1.10.0-rc.2
9+
dapr init --runtime-version=1.14.0

.github/workflows/itests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
GOOS: linux
4343
GOARCH: amd64
4444
GOPROXY: https://proxy.golang.org
45-
DAPR_CLI_VER: 1.13.0
46-
DAPR_RUNTIME_VER: 1.13.2
47-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.12/install/install.sh
45+
DAPR_CLI_VER: 1.14.0
46+
DAPR_RUNTIME_VER: 1.14.0
47+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/release-1.14/install/install.sh
4848
DAPR_CLI_REF: ''
4949
steps:
5050
- name: Set up Dapr CLI

daprdocs/content/en/dotnet-sdk-docs/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Dapr offers a variety of packages to help with the development of .NET applicati
1818

1919
- [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed
2020
- Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}})
21-
- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
21+
- [.NET 6+](https://dotnet.microsoft.com/download) installed
2222

2323
## Installation
2424

daprdocs/content/en/dotnet-sdk-docs/dotnet-actors/dotnet-actors-howto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ This project contains the implementation of the actor client which calls MyActor
4545

4646
- [Dapr CLI]({{< ref install-dapr-cli.md >}}) installed.
4747
- Initialized [Dapr environment]({{< ref install-dapr-selfhost.md >}}).
48-
- [.NET Core 3.1 or .NET 6+](https://dotnet.microsoft.com/download) installed. Dapr .NET SDK uses [ASP.NET Core](https://docs.microsoft.com/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-6.0).
48+
- [.NET 6+](https://dotnet.microsoft.com/download) installed. Dapr .NET SDK uses [ASP.NET Core](https://docs.microsoft.com/aspnet/core/introduction-to-aspnet-core?view=aspnetcore-6.0).
4949

5050
## Step 0: Prepare
5151

examples/Actor/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The Actor example shows how to create a virtual actor (`DemoActor`) and invoke i
44

55
## Prerequisites
66

7-
- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
7+
- [.NET 6+](https://dotnet.microsoft.com/download) installed
88
- [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
99
- [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
1010
- [Dapr .NET SDK](https://github.com/dapr/dotnet-sdk/)
@@ -102,7 +102,7 @@ docker push <your-docker-registry>/demo-actor:latest
102102
### Deploy the Actor service to Kubernetes
103103
#### Prerequisites
104104
- A Kubernetes cluster with `kubectl` configured to access it.
105-
- Dapr v1.13+ installed on the Kubernetes cluster. Follow the instructions [here](https://docs.dapr.io/getting-started/install-dapr-kubernetes/).
105+
- Dapr v1.14+ installed on the Kubernetes cluster. Follow the instructions [here](https://docs.dapr.io/getting-started/install-dapr-kubernetes/).
106106
- A Docker registry where you pushed the `DemoActor` image.
107107

108108
#### Deploy the Actor service

examples/Client/PublishSubscribe/BulkPublishEventExample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Prerequisites
44

5-
- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
5+
- [.NET 6+](https://dotnet.microsoft.com/download) installed
66
- [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
77
- [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
88
- [Dapr .NET SDK](https://docs.dapr.io/developing-applications/sdks/dotnet/)

examples/Client/PublishSubscribe/PublishEventExample/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Prerequisites
44

5-
- [.NET Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download) installed
5+
- [.NET 6+](https://dotnet.microsoft.com/download) installed
66
- [Dapr CLI](https://docs.dapr.io/getting-started/install-dapr-cli/)
77
- [Initialized Dapr environment](https://docs.dapr.io/getting-started/install-dapr-selfhost/)
88
- [Dapr .NET SDK](https://docs.dapr.io/developing-applications/sdks/dotnet/)

samples/Client/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The following examples will show you how to:
88

99
## Prerequisites
1010

11-
* [.Net Core 3.1 or .NET 5+](https://dotnet.microsoft.com/download)
11+
* [.NET 6+](https://dotnet.microsoft.com/download)
1212
* [Dapr CLI](https://github.com/dapr/cli)
1313
* [Dapr DotNet SDK](https://github.com/dapr/dotnet-sdk)
1414

src/Dapr.Client/Protos/dapr/proto/common/v1/common.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ message ConfigurationItem {
157157

158158
// the metadata which will be passed to/from configuration store component.
159159
map<string,string> metadata = 3;
160-
}
160+
}

src/Dapr.Client/Protos/dapr/proto/dapr/v1/appcallback.proto

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ syntax = "proto3";
1515

1616
package dapr.proto.runtime.v1;
1717

18+
import "google/protobuf/any.proto";
1819
import "google/protobuf/empty.proto";
1920
import "dapr/proto/common/v1/common.proto";
2021
import "google/protobuf/struct.proto";
@@ -59,8 +60,37 @@ service AppCallbackHealthCheck {
5960
service AppCallbackAlpha {
6061
// Subscribes bulk events from Pubsub
6162
rpc OnBulkTopicEventAlpha1(TopicEventBulkRequest) returns (TopicEventBulkResponse) {}
63+
64+
// Sends job back to the app's endpoint at trigger time.
65+
rpc OnJobEventAlpha1 (JobEventRequest) returns (JobEventResponse);
66+
}
67+
68+
message JobEventRequest {
69+
// Job name.
70+
string name = 1;
71+
72+
// Job data to be sent back to app.
73+
google.protobuf.Any data = 2;
74+
75+
// Required. method is a method name which will be invoked by caller.
76+
string method = 3;
77+
78+
// The type of data content.
79+
//
80+
// This field is required if data delivers http request body
81+
// Otherwise, this is optional.
82+
string content_type = 4;
83+
84+
// HTTP specific fields if request conveys http-compatible request.
85+
//
86+
// This field is required for http-compatible request. Otherwise,
87+
// this field is optional.
88+
common.v1.HTTPExtension http_extension = 5;
6289
}
6390

91+
// JobEventResponse is the response from the app when a job is triggered.
92+
message JobEventResponse {}
93+
6494
// TopicEventRequest message is compatible with CloudEvent spec v1.0
6595
// https://github.com/cloudevents/spec/blob/v1.0/spec.md
6696
message TopicEventRequest {
@@ -310,4 +340,4 @@ message ListInputBindingsResponse {
310340

311341
// HealthCheckResponse is the message with the response to the health check.
312342
// This message is currently empty as used as placeholder.
313-
message HealthCheckResponse {}
343+
message HealthCheckResponse {}

0 commit comments

Comments
 (0)