Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update orchestration discovery properties #1826

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

danegsta
Copy link
Member

@danegsta danegsta commented Jan 24, 2024

Standardize the MSBuild properties for orchestration discovery to use Dir suffix for directories and Path suffix for file names (to match the new dashboard discovery properties). Removes default path behavior for attributes if DcpDir isn't defined (workload is missing).

Microsoft Reviewers: Open in CodeFlow

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-integrations Issues pertaining to Aspire Integrations packages label Jan 24, 2024
@@ -114,11 +114,13 @@ internal static class ]]>%(ClassName)<![CDATA[
<Target Name="WriteServiceMetadataSources" DependsOnTargets="$(_WriteServiceMetadataSourcesDependsOn)" BeforeTargets="CoreCompile" />

<!-- This target registers the location of the Aspire orchestration dependencies -->
<Target Name="SetOrchestrationDiscoveryAttributes" BeforeTargets="GetAssemblyAttributes">
<Target Name="SetOrchestrationDiscoveryAttributes" BeforeTargets="GetAssemblyAttributes" Condition=" '$(DcpDir)' != '' ">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can something potentially break from making this whole target conditional where it wasn't before? (Before we were defaulting DcpDir if not set)

Not super familiar with these targets, so asking just in case.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll change the error the user sees; currently we report that we can't find the orchestrator at the fallback DcpDir path we were setting, but that path was a holdover from the pre-workload days. After the change, we'll throw a different error in DcpOptions.ApplyApplicationConfiguration when we see the CliPath wasn't set by the expected attribute.

@danegsta danegsta merged commit b8ca2fd into dotnet:main Jan 24, 2024
8 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Apr 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-integrations Issues pertaining to Aspire Integrations packages
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants