dapr
/
dotnet-sdk
mirror of https://github.com/dapr/dotnet-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from dapr/release-0.6 

Merge release-0.6 to master
This commit is contained in:
Young Bu Park 2019-10-08 19:08:10 -07:00 committed by GitHub
parent 9b13557131 acb6ca75ea
commit 93d2da8c6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/get-started-dapr-actor.md
View File

@ -389,7 +389,7 @@ In order to validate and debug actor service and client, we need to run actor se
MyActorClient will console out if it calls actor hosted in MyActorService successfully. MyActorClient will console out if it calls actor hosted in MyActorService successfully.
> If you specify the different dapr runtime http port (default port: 3500), you need to set DAPR_PORT environment variable before running the client. > If you specify the different dapr runtime http port (default port: 3500), you need to set DAPR_HTTP_PORT environment variable before running the client.
```bash ```bash
Success Success

2
properties/dapr_common.props
View File

@ -22,7 +22,7 @@
<NupkgMajorVersion>0</NupkgMajorVersion> <NupkgMajorVersion>0</NupkgMajorVersion>
<NupkgMinorVersion>6</NupkgMinorVersion> <NupkgMinorVersion>6</NupkgMinorVersion>
<NupkgPatchVersion>0</NupkgPatchVersion> <NupkgPatchVersion>0</NupkgPatchVersion>
<NupkgPreviewTag>-preview01</NupkgPreviewTag> <NupkgPreviewTag>-preview02</NupkgPreviewTag>
<NupkgVersion>$(NupkgMajorVersion).$(NupkgMinorVersion).$(NupkgPatchVersion)$(NupkgPreviewTag)</NupkgVersion> <NupkgVersion>$(NupkgMajorVersion).$(NupkgMinorVersion).$(NupkgPatchVersion)$(NupkgPreviewTag)</NupkgVersion>
</PropertyGroup> </PropertyGroup>

2
src/Microsoft.Dapr.Actors/Constants.cs
View File

@ -13,7 +13,7 @@ namespace Microsoft.Dapr.Actors
public const string RequestIdHeaderName = "X-DaprRequestId"; public const string RequestIdHeaderName = "X-DaprRequestId";
public const string RequestHeaderName = "X-DaprRequestHeader"; public const string RequestHeaderName = "X-DaprRequestHeader";
public const string ErrorResponseHeaderName = "X-DaprErrorResponseHeader"; public const string ErrorResponseHeaderName = "X-DaprErrorResponseHeader";
public const string DaprPortEnvironmentVariable = "DAPR_PORT"; public const string DaprHttpPortEnvironmentVariable = "DAPR_HTTP_PORT";
public const string Dapr = "dapr"; public const string Dapr = "dapr";
public const string Config = "config"; public const string Config = "config";
public const string State = "state"; public const string State = "state";

2
src/Microsoft.Dapr.Actors/DaprHttpInteractor.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.Dapr.Actors
params DelegatingHandler[] delegateHandlers) params DelegatingHandler[] delegateHandlers)
{ {
// Get Dapr port from Environment Variable if it has been overridden. // Get Dapr port from Environment Variable if it has been overridden.
var daprPort = Environment.GetEnvironmentVariable(Constants.DaprPortEnvironmentVariable); var daprPort = Environment.GetEnvironmentVariable(Constants.DaprHttpPortEnvironmentVariable);
if (daprPort != null) if (daprPort != null)
{ {
this.daprPort = daprPort; this.daprPort = daprPort;

2
src/Microsoft.Dapr.Client/DaprUris.cs
View File

@ -11,6 +11,6 @@ namespace Microsoft.Dapr
{ {
public const string StatePath = "/v1.0/state"; public const string StatePath = "/v1.0/state";
public static string DefaultPort => Environment.GetEnvironmentVariable("DAPR_PORT") ?? "3500"; public static string DefaultPort => Environment.GetEnvironmentVariable("DAPR_HTTP_PORT") ?? "3500";
} }
} }