Enable dapr tests on CI

playground/dapr/Dapr.AppHost/Dapr.AppHost.csproj

@@ -15,6 +15,7 @@
   <ItemGroup>
     <AspireProjectOrPackageReference Include="Aspire.Hosting.AppHost" />
     <AspireProjectOrPackageReference Include="Aspire.Hosting.Dapr" />
+    <AspireProjectOrPackageReference Include="Aspire.Hosting.Redis" />
 
     <ProjectReference Include="..\ServiceA\DaprServiceA.csproj" />
     <ProjectReference Include="..\ServiceB\DaprServiceB.csproj" />

playground/dapr/Dapr.AppHost/Program.cs

@@ -1,5 +1,6 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
+var redis = builder.AddRedis("redis", 6379);
 var stateStore = builder.AddDaprStateStore("statestore");
 var pubSub = builder.AddDaprPubSub("pubsub");
 

src/Aspire.Hosting.Azure/Aspire.Hosting.Azure.csproj

@@ -17,6 +17,7 @@
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessResult.cs" Link="Provisioning\Utils\ProcessResult.cs" />
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessSpec.cs" Link="Provisioning\Utils\ProcessSpec.cs" />
     <Compile Include="..\Aspire.Hosting\Dcp\Process\ProcessUtil.cs" Link="Provisioning\Utils\ProcessUtil.cs" />
+    <Compile Include="..\Shared\FileUtil.cs" Link="Shared\FileUtil.cs" />
     <Compile Include="..\Shared\Cosmos\CosmosConstants.cs" Link="Shared\CosmosConstants.cs" />
   </ItemGroup>
 

src/Aspire.Hosting.Azure/Provisioning/Provisioners/BicepProvisioner.cs

@@ -123,7 +123,7 @@ await notificationService.PublishUpdateAsync(resource, state => state with
 
         PopulateWellKnownParameters(resource, context);
 
-        if (FindFullPathFromPath("az") is not { } azPath)
+        if (FileUtil.FindFullPathFromPath("az") is not { } azPath)
         {
             throw new AzureCliNotOnPathException();
         }
@@ -395,30 +395,6 @@ private static async Task<bool> ExecuteCommand(ProcessSpec processSpec)
         }
     }
 
-    private static string? FindFullPathFromPath(string command) => FindFullPathFromPath(command, Environment.GetEnvironmentVariable("PATH"), Path.PathSeparator, File.Exists);
-
-    private static string? FindFullPathFromPath(string command, string? pathVariable, char pathSeparator, Func<string, bool> fileExists)
-    {
-        Debug.Assert(!string.IsNullOrWhiteSpace(command));
-
-        if (OperatingSystem.IsWindows())
-        {
-            command += ".cmd";
-        }
-
-        foreach (var directory in (pathVariable ?? string.Empty).Split(pathSeparator))
-        {
-            var fullPath = Path.Combine(directory, command);
-
-            if (fileExists(fullPath))
-            {
-                return fullPath;
-            }
-        }
-
-        return null;
-    }
-
     internal static string GetChecksum(AzureBicepResource resource, JsonObject parameters)
     {
         // TODO: PERF Inefficient

src/Aspire.Hosting.Dapr/Aspire.Hosting.Dapr.csproj

@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedDir)FileUtil.cs" Link="Utils\FileUtil.cs" />
     <Compile Include="$(SharedDir)Utf8JsonWriterExtensions.cs" Link="Utils\Utf8JsonWriterExtensions.cs" />
   </ItemGroup>
 

src/Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs

@@ -41,7 +41,7 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
         var sideCars = new List<ExecutableResource>();
 
         var fileName = this._options.DaprPath
-            ?? GetDefaultDaprPath()
+            ?? FileUtil.FindFullPathFromPath("dapr")
             ?? throw new DistributedApplicationException("Unable to locate the Dapr CLI.");
 
         foreach (var resource in appModel.Resources)
@@ -282,49 +282,6 @@ public async Task BeforeStartAsync(DistributedApplicationModel appModel, Cancell
         return null;
     }
 
-    /// <summary>
-    /// Return the first verified dapr path
-    /// </summary>
-    static string? GetDefaultDaprPath()
-    {
-        foreach (var path in GetAvailablePaths())
-        {
-            if (File.Exists(path))
-            {
-                return path;
-            }
-        }
-
-        return default;
-
-        // Return all the possible paths for dapr
-        static IEnumerable<string> GetAvailablePaths()
-        {
-            if (OperatingSystem.IsWindows())
-            {
-                var pathRoot = Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.Windows)) ?? "C:";
-
-                // Installed windows paths:
-                yield return Path.Combine(pathRoot, "dapr", "dapr.exe");
-
-                yield break;
-            }
-
-            // Add $HOME/dapr path:
-            var homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            yield return Path.Combine(homePath, "dapr", "dapr");
-
-            // Linux & MacOS path:
-            yield return Path.Combine("/usr", "local", "bin", "dapr");
-
-            // MacOS Homebrew path:
-            if (OperatingSystem.IsMacOS() && Environment.GetEnvironmentVariable("HOMEBREW_PREFIX") is string homebrewPrefix)
-            {
-                yield return Path.Combine(homebrewPrefix, "bin", "dapr");
-            }
-        }
-    }
-
     public void Dispose()
     {
         if (_onDemandResourcesRootPath is not null)

tests/Aspire.Components.Common.Tests/FileUtil.cs → src/Shared/FileUtil.cs

@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 
-namespace Aspire.Components.Common.Tests;
+namespace Aspire;
 
 internal static class FileUtil
 {

tests/Aspire.Components.Common.Tests/Aspire.Components.Common.Tests.csproj

@@ -6,6 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Include="$(SharedDir)FileUtil.cs" />
+
     <PackageReference Include="JsonSchema.Net" />
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />

tests/Aspire.Playground.Tests/AppHostTests.cs

@@ -185,6 +185,11 @@ public static IList<TestEndpoints> GetAllTestEndpoints()
                 waitForTexts: [
                     new ("storage", "Azurite Table service is successfully listening")
                 ]),
+            new TestEndpoints("Dapr.AppHost",
+                resourceEndpoints: new() {
+                    { "servicea", ["/alive", "/health", "/weatherforecast"] },
+                    { "serviceb", ["/alive", "/health", "/weatherforecast"] },
+                }),
             new TestEndpoints("MilvusPlayground.AppHost",
                 resourceEndpoints: new() { { "apiservice", ["/alive", "/health", "/create", "/search"] } },
                 waitForTexts: [

tests/Aspire.Playground.Tests/Aspire.Playground.Tests.csproj

@@ -49,6 +49,7 @@
     <!-- Only `dotnet run` startup checked -->
     <ProjectReference Include="$(PlaygroundSourceDir)mongo/Mongo.AppHost/Mongo.AppHost.csproj" />
 
+    <ProjectReference Include="$(PlaygroundSourceDir)dapr/Dapr.AppHost/Dapr.AppHost.csproj" />
     <ProjectReference Include="$(PlaygroundSourceDir)mysql/MySqlDb.AppHost/MySqlDb.AppHost.csproj" />
     <ProjectReference Include="$(PlaygroundSourceDir)nats/Nats.AppHost/Nats.AppHost.csproj" />
     <ProjectReference Include="$(PlaygroundSourceDir)seq/Seq.AppHost/Seq.AppHost.csproj" />

tests/helix/send-to-helix-basictests.targets

@@ -4,6 +4,7 @@
     <WorkItemArchiveWildCard>$(TestArchiveTestsDir)**/*.zip</WorkItemArchiveWildCard>
     <BuildHelixWorkItemsDependsOn>$(BuildHelixWorkItemsDependsOn);BuildHelixWorkItemsForDefaultTests</BuildHelixWorkItemsDependsOn>
     <NeedsDcpPathOverride>true</NeedsDcpPathOverride>
+    <NeedsDapr>true</NeedsDapr>
   </PropertyGroup>
 
   <ItemGroup>

tests/helix/send-to-helix-buildonhelixtests.targets

@@ -4,6 +4,7 @@
     <BuildHelixWorkItemsDependsOn>$(BuildHelixWorkItemsDependsOn);BuildHelixWorkItemsForBuildOnHelixTests</BuildHelixWorkItemsDependsOn>
     <NeedsWorkload>true</NeedsWorkload>
     <NeedsPlaywright>true</NeedsPlaywright>
+    <NeedsDapr>true</NeedsDapr>
 
     <WorkItemArchiveWildCard>$(TestArchiveTestsDirForBuildOnHelixTests)**/*.zip</WorkItemArchiveWildCard>
 

tests/helix/send-to-helix-inner.proj

@@ -89,6 +89,18 @@
     <HelixPreCommand Condition="'$(OS)' != 'Windows_NT'" Include="export PLAYWRIGHT_BROWSERS_PATH=$HELIX_CORRELATION_PAYLOAD/playwright-deps" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(NeedsDapr)' == 'true'">
+    <HelixCorrelationPayload Condition="'$(OS)' != 'Windows_NT'" Include="dapr" Uri="https://github.com/dapr/cli/releases/download/v1.14.1/dapr_linux_amd64.tar.gz" Destination="dapr-cli" />
+    <HelixCorrelationPayload Condition="'$(OS)' == 'Windows_NT'" Include="dapr" Uri="https://github.com/dapr/cli/releases/download/v1.14.1/dapr_windows_amd64.zip" Destination="dapr-cli" />
+
+    <HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\dapr-cli%3B%PATH%" />
+    <HelixPreCommand Condition="'$(OS)' != 'Windows_NT'" Include="export PATH=$HELIX_CORRELATION_PAYLOAD/dapr-cli:$PATH" />
+
+    <HelixPreCommand Include="dapr init" />
+    <HelixPreCommand Include="dapr --version" />
+    <HelixPreCommand Include="dapr ps" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(NeedsWorkload)' == 'true'">
     <HelixPreCommand Condition="'$(OS)' == 'Windows_NT'" Include="set PATH=%HELIX_CORRELATION_PAYLOAD%\dotnet-latest%3B%PATH%" />
     <HelixPreCommand Condition="'$(OS)' != 'Windows_NT'" Include="export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet-latest:$PATH" />