Skip to content

Commit

Permalink
Merge branch 'v1.12' into endgame_v1.12_prep
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhunter-ms
hhunter-ms authored Oct 11, 2023
2 parents 96c0a92 + 63deb19 commit 874b1f3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion sdkdocs/dotnet
Submodule dotnet updated 72 files
+1 −9 .github/workflows/itests.yml
+1 −7 .github/workflows/sdk_build.yml
+10 −0 daprdocs/content/en/dotnet-sdk-docs/dotnet-actors/dotnet-actors-howto.md
+1 −1 examples/Actor/ActorClient/ActorClient.csproj
+1 −1 examples/Actor/DemoActor/DemoActor.csproj
+1 −1 examples/Actor/IDemoActor/IDemoActor.csproj
+1 −1 examples/AspNetCore/ControllerSample/ControllerSample.csproj
+1 −1 examples/AspNetCore/ControllerSample/README.md
+1 −1 examples/AspNetCore/GrpcServiceSample/GrpcServiceSample.csproj
+1 −1 examples/AspNetCore/GrpcServiceSample/README.md
+1 −1 examples/AspNetCore/RoutingSample/README.md
+1 −1 examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md
+1 −1 examples/AspNetCore/SecretStoreConfigurationProviderSample/SecretStoreConfigurationProviderSample.csproj
+1 −1 examples/Client/ConfigurationApi/ConfigurationApi.csproj
+1 −1 examples/Client/ConfigurationApi/README.md
+1 −1 examples/Client/DistributedLock/DistributedLock.csproj
+1 −1 examples/Client/DistributedLock/README.md
+1 −1 examples/Client/PublishSubscribe/BulkPublishEventExample/BulkPublishEventExample.csproj
+1 −1 examples/Client/PublishSubscribe/PublishEventExample/PublishEventExample.csproj
+1 −1 examples/Client/ServiceInvocation/README.md
+1 −1 examples/Client/ServiceInvocation/ServiceInvocation.csproj
+1 −1 examples/Client/StateManagement/README.md
+1 −1 examples/Client/StateManagement/StateManagement.csproj
+4 −0 examples/Workflow/README.md
+120 −109 examples/Workflow/WorkflowConsoleApp/Program.cs
+1 −2 properties/IsExternalInit.cs
+1 −1 src/Dapr.Actors.AspNetCore/Dapr.Actors.AspNetCore.csproj
+10 −1 src/Dapr.Actors/Client/ActorProxyFactory.cs
+5 −0 src/Dapr.Actors/Client/ActorProxyOptions.cs
+1 −1 src/Dapr.Actors/Communication/ActorInvokeException.cs
+9 −8 src/Dapr.Actors/Communication/ActorMessageBodyDataContractSerializationProvider.cs
+95 −0 src/Dapr.Actors/Communication/ActorMessageBodyJsonConverter.cs
+175 −0 src/Dapr.Actors/Communication/ActorMessageBodyJsonSerializationProvider.cs
+2 −1 src/Dapr.Actors/Communication/IActorRequestMessageBodySerializer.cs
+2 −1 src/Dapr.Actors/Communication/IActorResponseMessageBodySerializer.cs
+1 −1 src/Dapr.Actors/Dapr.Actors.csproj
+9 −9 src/Dapr.Actors/DaprHttpInteractor.cs
+28 −3 src/Dapr.Actors/Runtime/Actor.cs
+15 −6 src/Dapr.Actors/Runtime/ActorManager.cs
+1 −0 src/Dapr.Actors/Runtime/ActorRuntime.cs
+18 −2 src/Dapr.Actors/Runtime/ActorRuntimeOptions.cs
+0 −82 src/Dapr.Actors/Runtime/DataContractStateSerializer.cs
+1 −1 src/Dapr.AspNetCore/Dapr.AspNetCore.csproj
+1 −1 src/Dapr.Client/Dapr.Client.csproj
+26 −18 src/Dapr.Client/DaprClientGrpc.cs
+1 −1 src/Dapr.Client/InvocationHandler.cs
+1 −1 src/Dapr.Extensions.Configuration/Dapr.Extensions.Configuration.csproj
+5 −1 src/Dapr.Workflow/Dapr.Workflow.csproj
+58 −5 src/Dapr.Workflow/WorkflowServiceCollectionExtensions.cs
+10 −10 src/Shared/DaprDefaults.cs
+1 −1 test/Dapr.Actors.AspNetCore.IntegrationTest.App/Dapr.Actors.AspNetCore.IntegrationTest.App.csproj
+1 −1 test/Dapr.Actors.AspNetCore.IntegrationTest/Dapr.Actors.AspNetCore.IntegrationTest.csproj
+1 −1 test/Dapr.Actors.AspNetCore.Test/Dapr.Actors.AspNetCore.Test.csproj
+1 −1 test/Dapr.Actors.Test/Dapr.Actors.Test.csproj
+2 −2 test/Dapr.Actors.Test/Runtime/ActorManagerTests.cs
+1 −1 test/Dapr.AspNetCore.IntegrationTest.App/Dapr.AspNetCore.IntegrationTest.App.csproj
+1 −1 test/Dapr.AspNetCore.IntegrationTest/Dapr.AspNetCore.IntegrationTest.csproj
+1 −1 test/Dapr.AspNetCore.Test/Dapr.AspNetCore.Test.csproj
+1 −1 test/Dapr.Client.Test/Dapr.Client.Test.csproj
+1 −1 test/Dapr.E2E.Test.Actors/Dapr.E2E.Test.Actors.csproj
+22 −0 test/Dapr.E2E.Test.Actors/ISerializationActor.cs
+1 −1 test/Dapr.E2E.Test.App.Grpc/Dapr.E2E.Test.App.Grpc.csproj
+1 −1 test/Dapr.E2E.Test.App.ReentrantActor/Dapr.E2E.Test.App.ReentrantActors.csproj
+26 −0 test/Dapr.E2E.Test.App/Actors/SerializationActor.cs
+1 −1 test/Dapr.E2E.Test.App/Dapr.E2E.Test.App.csproj
+6 −0 test/Dapr.E2E.Test.App/Startup.cs
+88 −0 test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs
+1 −1 test/Dapr.E2E.Test/Dapr.E2E.Test.csproj
+4 −2 test/Dapr.E2E.Test/DaprRunConfiguration.cs
+6 −9 test/Dapr.E2E.Test/DaprTestApp.cs
+3 −1 test/Dapr.E2E.Test/E2ETests.cs
+1 −1 test/Dapr.Extensions.Configuration.Test/Dapr.Extensions.Configuration.Test.csproj
2 changes: 1 addition & 1 deletion sdkdocs/go
Submodule go updated 14 files
+35 −34 .github/workflows/test-on-push.yaml
+2 −0 .github/workflows/validate_examples.yaml
+23 −15 .golangci.yml
+9 −0 Makefile
+2 −3 actor/manager/manager.go
+1 −0 actor/state/actor_state_change_test.go
+1 −2 client/actor.go
+6 −0 client/client.go
+15 −0 client/client_test.go
+129 −0 client/metadata.go
+29 −0 client/metadata_test.go
+8 −8 examples/configuration/go.mod
+17 −17 examples/configuration/go.sum
+2 −1 service/internal/topicregistrar_test.go
2 changes: 1 addition & 1 deletion sdkdocs/java
Submodule java updated 213 files
2 changes: 1 addition & 1 deletion sdkdocs/js
Submodule js updated 8 files
+6 −0 .github/holopin.yml
+4 −0 daprdocs/content/en/js-sdk-contributing/js-contributing.md
+57 −2 daprdocs/content/en/js-sdk-docs/js-client/_index.md
+33 −21 examples/configuration/README.md
+12 −0 examples/configuration/components/redis-config.yaml
+7 −7 examples/configuration/package-lock.json
+19 −4 examples/configuration/src/index.ts
+1 −0 src/enum/HttpMethod.enum.ts
2 changes: 1 addition & 1 deletion sdkdocs/python
Submodule python updated 86 files
+7 −0 .github/holopin.yml
+5 −5 .github/workflows/build.yaml
+1 −1 .github/workflows/dapr-bot-schedule.yml
+1 −1 .github/workflows/fossa.yaml
+4 −4 .github/workflows/validate_examples.yaml
+2 −2 README.md
+36 −26 dapr/aio/clients/grpc/client.py
+9 −8 dapr/clients/__init__.py
+1 −3 dapr/clients/grpc/_helpers.py
+52 −37 dapr/clients/grpc/client.py
+19 −5 dapr/clients/http/client.py
+4 −3 dapr/clients/http/dapr_invocation_http_client.py
+2 −0 dapr/conf/global_settings.py
+56 −0 dapr/conf/helpers.py
+3 −89 dapr/proto/common/v1/common_pb2.py
+10 −0 dapr/proto/common/v1/common_pb2.pyi
+3 −173 dapr/proto/runtime/v1/appcallback_pb2.py
+20 −0 dapr/proto/runtime/v1/appcallback_pb2.pyi
+132 −1,052 dapr/proto/runtime/v1/dapr_pb2.py
+209 −11 dapr/proto/runtime/v1/dapr_pb2.pyi
+238 −0 dapr/proto/runtime/v1/dapr_pb2_grpc.py
+1 −1 dapr/version/version.py
+1 −1 daprdocs/content/en/python-sdk-docs/_index.md
+1 −1 daprdocs/content/en/python-sdk-docs/python-actor.md
+37 −0 daprdocs/content/en/python-sdk-docs/python-client.md
+2 −2 daprdocs/content/en/python-sdk-docs/python-sdk-extensions/python-workflow-ext/python-workflow.md
+1 −0 dev-requirements.txt
+2 −2 examples/README.md
+2 −2 examples/configuration/README.md
+1 −1 examples/configuration/configuration.py
+1 −1 examples/demo_actor/README.md
+1 −1 examples/demo_actor/demo_actor/Dockerfile
+1 −1 examples/demo_actor/demo_actor/requirements.txt
+2 −2 examples/demo_workflow/README.md
+3 −2 examples/demo_workflow/app.py
+2 −2 examples/distributed_lock/README.md
+1 −1 examples/grpc_proxying/README.md
+3 −3 examples/invoke-binding/README.md
+1 −1 examples/invoke-custom-data/README.md
+26 −0 examples/invoke-http/invoke-caller.py
+15 −0 examples/invoke-http/invoke-receiver.py
+2 −2 examples/invoke-simple/Dockerfile
+1 −1 examples/invoke-simple/README.md
+2 −2 examples/invoke-simple/requirements.txt
+5 −4 examples/metadata/README.md
+1 −1 examples/pubsub-simple/README.md
+3 −3 examples/secret_store/README.md
+1 −1 examples/state_store/README.md
+3 −3 examples/state_store_query/README.md
+2 −2 examples/w3c-tracing/Dockerfile
+1 −1 examples/w3c-tracing/README.md
+2 −2 examples/w3c-tracing/requirements.txt
+145 −0 examples/workflow/README.md
+62 −0 examples/workflow/fan_out_fan_in.py
+122 −0 examples/workflow/human_approval.py
+78 −0 examples/workflow/monitor.py
+1 −0 examples/workflow/requirements.txt
+67 −0 examples/workflow/task_chaining.py
+1 −1 ext/dapr-ext-fastapi/dapr/ext/fastapi/version.py
+3 −3 ext/dapr-ext-fastapi/setup.cfg
+1 −1 ext/dapr-ext-grpc/dapr/ext/grpc/version.py
+3 −3 ext/dapr-ext-grpc/setup.cfg
+3 −0 ext/dapr-ext-workflow/dapr/ext/workflow/__init__.py
+7 −1 ext/dapr-ext-workflow/dapr/ext/workflow/dapr_workflow_client.py
+1 −1 ext/dapr-ext-workflow/dapr/ext/workflow/version.py
+1 −1 ext/dapr-ext-workflow/dapr/ext/workflow/workflow_activity_context.py
+3 −3 ext/dapr-ext-workflow/dapr/ext/workflow/workflow_context.py
+14 −4 ext/dapr-ext-workflow/dapr/ext/workflow/workflow_runtime.py
+17 −0 ext/dapr-ext-workflow/dapr/ext/workflow/workflow_state.py
+3 −4 ext/dapr-ext-workflow/setup.cfg
+1 −1 ext/flask_dapr/flask_dapr/version.py
+3 −3 ext/flask_dapr/setup.cfg
+1 −1 mypy.ini
+3 −3 setup.cfg
+42 −0 tests/clients/certs.py
+33 −7 tests/clients/fake_dapr_server.py
+19 −2 tests/clients/fake_http_server.py
+43 −46 tests/clients/test_dapr_async_grpc_client.py
+42 −41 tests/clients/test_dapr_grpc_client.py
+41 −74 tests/clients/test_http_service_invocation_client.py
+89 −0 tests/clients/test_secure_dapr_async_grpc_client.py
+84 −0 tests/clients/test_secure_dapr_grpc_client.py
+91 −0 tests/clients/test_secure_http_service_invocation_client.py
+144 −0 tests/conf/helpers_test.py
+1 −1 tools/requirements.txt
+1 −1 tox.ini

0 comments on commit 874b1f3

Please sign in to comment.