Merge branch 'release-1.16' into dropnet6and7

Signed-off-by: Whit Waldo <whit.waldo@innovian.net>

Author: WhitWaldo

examples/AspNetCore/SecretStoreConfigurationProviderSample/README.md

@@ -20,7 +20,7 @@ To load secrets into configuration call the _AddDaprSecretStore_ extension metho
 Use Dapr to run the application:
 
 ```shell
-dapr run --app-id SecretStoreConfigurationProviderSample --components-path ./components/ -- dotnet run
+dapr run --app-id SecretStoreConfigurationProviderSample --resources-path ./components/ -- dotnet run
 ```
 
 ### 2. Test the application

examples/Client/ConfigurationApi/README.md

@@ -147,7 +147,7 @@ cd examples/Client/ConfigurationApi
 To run the `ConfigurationExample`, execute the following command:
 
 ```bash
-dapr run --app-id configexample --components-path ./Components -- dotnet run
+dapr run --app-id configexample --resources-path ./Components -- dotnet run
 ```
 
 ### Get Configuration

examples/Client/DistributedLock/README.md

@@ -24,7 +24,7 @@ cd examples/Client/DistributedLock
 In order to run the application that generates data for the workers to process, simply run the following command:
 
 ```bash
-dapr run --components-path ./Components --app-id generator -- dotnet run
+dapr run --resources-path ./Components --app-id generator -- dotnet run
 ```
 
 This application will create a new file to process once every 10 seconds. The files are stored in `DistributedLock/tmp`.
@@ -33,8 +33,8 @@ This application will create a new file to process once every 10 seconds. The fi
 In order to properly demonstrate locking, this application will be run more than once with the same App ID. However, the applications do need different ports in order to properly receive bindings. Run them with the command below:
 
 ```bash
-dapr run --components-path ./Components --app-id worker --app-port 5000 -- dotnet run
-dapr run --components-path ./Components --app-id worker --app-port 5001 -- dotnet run
+dapr run --resources-path ./Components --app-id worker --app-port 5000 -- dotnet run
+dapr run --resources-path ./Components --app-id worker --app-port 5001 -- dotnet run
 ```
 
 After running the applications, they will attempt to process files. You should see output such as:

test/Dapr.E2E.Test/Actors/E2ETests.CustomSerializerTests.cs

@@ -97,7 +97,7 @@ public async Task ActorCanSupportCustomSerializer()
         /// <see cref="ISerializationActor"/>. (it's defined in the base of it.)
         /// That why <see cref="ISerializationActor.AnotherMethod(DateTime)"/> was created,
         /// so there are now more then one method.
-        /// </remark>
+        /// </remarks>
         [Fact]
         public async Task ActorCanSupportCustomSerializerAndCallMoreThenOneDefinedMethod()
         {

test/Dapr.E2E.Test/DaprTestApp.cs

@@ -45,7 +45,7 @@ public DaprTestApp(ITestOutputHelper output, string appId)
         {
             var (appPort, httpPort, grpcPort, metricsPort) = GetFreePorts();
 
-            var componentsPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components");
+            var resourcesPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "components");
             var configPath = Combine(".", "..", "..", "..", "..", "..", "test", "Dapr.E2E.Test", "configuration", "featureconfig.yaml");
             var arguments = new List<string>()
             {
@@ -55,11 +55,10 @@ public DaprTestApp(ITestOutputHelper output, string appId)
                 "--dapr-http-port", httpPort.ToString(CultureInfo.InvariantCulture),
                 "--dapr-grpc-port", grpcPort.ToString(CultureInfo.InvariantCulture),
                 "--metrics-port", metricsPort.ToString(CultureInfo.InvariantCulture),
-                "--components-path", componentsPath,
+                "--resources-path", resourcesPath,
                 "--config", configPath,
                 "--log-level", "debug",
-                "--dapr-http-max-request-size", "32",
-
+                "--max-body-size", "8Mi"
             };
 
             if (configuration.UseAppPort)