diff --git a/samples/dapr/pub-sub/orders/Startup.cs b/samples/dapr/pub-sub/orders/Startup.cs
index 2ed86a13..095786cd 100644
--- a/samples/dapr/pub-sub/orders/Startup.cs
+++ b/samples/dapr/pub-sub/orders/Startup.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
diff --git a/samples/dapr/pub-sub/orders/orders.csproj b/samples/dapr/pub-sub/orders/orders.csproj
index f662960b..5a7c3878 100644
--- a/samples/dapr/pub-sub/orders/orders.csproj
+++ b/samples/dapr/pub-sub/orders/orders.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/samples/dapr/pub-sub/products/products.csproj b/samples/dapr/pub-sub/products/products.csproj
index f662960b..5a7c3878 100644
--- a/samples/dapr/pub-sub/products/products.csproj
+++ b/samples/dapr/pub-sub/products/products.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/samples/dapr/pub-sub/store/store.csproj b/samples/dapr/pub-sub/store/store.csproj
index c59f437c..5a126fba 100644
--- a/samples/dapr/pub-sub/store/store.csproj
+++ b/samples/dapr/pub-sub/store/store.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/samples/dapr/service-invocation/SentenceApp/SentenceApp.csproj b/samples/dapr/service-invocation/SentenceApp/SentenceApp.csproj
index 0f8fc708..4d128527 100644
--- a/samples/dapr/service-invocation/SentenceApp/SentenceApp.csproj
+++ b/samples/dapr/service-invocation/SentenceApp/SentenceApp.csproj
@@ -5,8 +5,8 @@
-
-
+
+
diff --git a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
index bf654fb0..cf8f802c 100644
--- a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
+++ b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
@@ -107,7 +107,7 @@ namespace Microsoft.Tye.Extensions.Dapr
// These environment variables are replaced with environment variables
// defined for this service.
- Args = $"run --app-id {project.Name} --app-port %APP_PORT% --dapr-grpc-port %DAPR_GRPC_PORT% --dapr-http-port %DAPR_HTTP_PORT% --metrics-port %METRICS_PORT% --placement-host-address localhost:{daprPlacementPort}",
+ Args = $"-app-id {project.Name} -app-port %APP_PORT% -dapr-grpc-port %DAPR_GRPC_PORT% --dapr-http-port %DAPR_HTTP_PORT% --metrics-port %METRICS_PORT% --placement-host-address localhost:{daprPlacementPort}",
};
// When running locally `-config` specifies a filename, not a configuration name. By convention
@@ -117,7 +117,7 @@ namespace Microsoft.Tye.Extensions.Dapr
var configFile = Path.Combine(context.Application.Source.DirectoryName!, "components", $"{daprConfig}.yaml");
if (File.Exists(configFile))
{
- proxy.Args += $" --config \"{configFile}\"";
+ proxy.Args += $" -config \"{configFile}\"";
}
else
{
@@ -127,12 +127,12 @@ namespace Microsoft.Tye.Extensions.Dapr
if (config.Data.TryGetValue("log-level", out obj) && obj?.ToString() is string logLevel)
{
- proxy.Args += $" --log-level {logLevel}";
+ proxy.Args += $" -log-level {logLevel}";
}
if (config.Data.TryGetValue("components-path", out obj) && obj?.ToString() is string componentsPath)
{
- proxy.Args += $" --components-path {componentsPath}";
+ proxy.Args += $" -components-path {componentsPath}";
}
// Add dapr proxy as a service available to everyone.
proxy.Dependencies.UnionWith(context.Application.Services.Select(s => s.Name));
@@ -271,7 +271,7 @@ namespace Microsoft.Tye.Extensions.Dapr
// Starting with dapr version 11, dapr is installed in user profile/home.
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
- var windowsPath = Environment.ExpandEnvironmentVariables("%HOMEDRIVE%/dapr/dapr.exe");
+ var windowsPath = Environment.ExpandEnvironmentVariables("%USERPROFILE%/.dapr/bin/daprd.exe");
if (File.Exists(windowsPath))
{
return windowsPath;
@@ -279,7 +279,7 @@ namespace Microsoft.Tye.Extensions.Dapr
}
else
{
- var nixpath = "/usr/local/bin/dapr";
+ var nixpath = Environment.ExpandEnvironmentVariables("%HOME%/.dapr/bin/daprd");
if (File.Exists(nixpath))
{
return nixpath;
@@ -287,7 +287,7 @@ namespace Microsoft.Tye.Extensions.Dapr
}
// Older version of dapr don't have dapr in the bin directory, but it is usually on the path.
- return "dapr";
+ return "daprd";
}
}
}
diff --git a/src/Microsoft.Tye.Hosting/TyeHost.cs b/src/Microsoft.Tye.Hosting/TyeHost.cs
index d682fc88..4690d24f 100644
--- a/src/Microsoft.Tye.Hosting/TyeHost.cs
+++ b/src/Microsoft.Tye.Hosting/TyeHost.cs
@@ -339,7 +339,14 @@ namespace Microsoft.Tye.Hosting
if (DashboardWebApplication != null)
{
// Stop the host after everything else has been shutdown
- await DashboardWebApplication.StopAsync();
+ try
+ {
+ await DashboardWebApplication.StopAsync();
+ }
+ catch (OperationCanceledException)
+ {
+ // ignore cancellation failures from stop async
+ }
}
}