wip

dotnet · Aug 7, 2024 · 1775a96 · 1775a96
1 parent 173a640
commit 1775a96
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Aspire.Hosting/Dcp/DcpOptions.cs b/src/Aspire.Hosting/Dcp/DcpOptions.cs
@@ -111,8 +111,11 @@ public void Configure(DcpOptions options)
         var dcpPublisherConfiguration = configuration.GetSection(DcpPublisher);
         var assemblyMetadata = appOptions.Assembly?.GetCustomAttributes<AssemblyMetadataAttribute>();
 
-        string? dcpDirEnvVar = Environment.GetEnvironmentVariable("ASPIRE_DCP_DIR");
-        if (!string.IsNullOrEmpty(dcpDirEnvVar))
+        // Find dcp tools path in the following order:
+        // 1. Environment variable ASPIRE_DCP_DIR
+        // 2. Configuration value
+        // 3. Assembly metadata
+        if (Environment.GetEnvironmentVariable("ASPIRE_DCP_DIR") is var dcpDirEnvVar && !string.IsNullOrEmpty(dcpDirEnvVar))
         {
             SetDcpPathsFromDcpDir(dcpDirEnvVar);
         }