Merging branch release/9.2 into main #8703
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… access or passwords with emulator (dotnet#8503) * Follow up keyvault changes - Pass the IKeyVaultSecretReference to the SecretResolver - Don't add the default keyvault when using the emulator. * Enhance Azure Key Vault integration and add access key authentication support for CosmosDB and other resources * Add the KeyVault resource, but remove it from the model in BeforeStart if the Azure resource is emulated or container in run mode. * Add Microsoft.Extensions.DependencyInjection using statement * Respond to PR feedback --------- Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
* Tweak tracing code. * aspire new with prompting. * Template selection. --------- Co-authored-by: Mitch Denny <midenn@microsoft.com>
Using the Azure prefix, as we do this everywhere else. Contributes to dotnet#7811 Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
…#8538) Contributes to dotnet#7811 Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
…m public API (dotnet#8530) These properties may change over time or be moved in the future. We don't want to expose them just yet. Will expose later if they need to be public. Contributes to dotnet#7811 Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
* Improve path prompt for aspire new command. * Turn project option into argument on aspire run. * Fix up message. --------- Co-authored-by: Mitch Denny <midenn@microsoft.com>
…ionExecutionContext (dotnet#8539) * Make DistributedApplicationExecutionContext.PublisherName not nullable Contributes to dotnet#7811 * Improve ctor * Prevent null publisher name --------- Co-authored-by: Sebastien Ros <sebastienros@gmail.com>
…#8552) * Adding descriptions to all args/options in CLI. * Revert project arg to option. * PR feedback. * Rename resource to integration. * Update src/Aspire.Cli/Commands/RunCommand.cs --------- Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
…ntainerFiles (dotnet#8558) * Switch to null as default for owner and group in WithContainerFiles * Fix failing test * Update doc comment * Call out that 0 is root --------- Co-authored-by: David Negstad <David.Negstad@microsoft.com>
* Make publishers prompt async for faster cancellation. * Make AppHost crash if no backchannel is attached and publishing fails. * Switch LogError to LogDebug (whoops) * Return correct result from TryGetContainerImageName in compose publisher. Add Dockerfile resource to playground for verification. * Improves publisher failure UX. * Update src/Aspire.Cli/Commands/PublishCommand.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Mitch Denny <midenn@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
Co-authored-by: Mitch Denny <midenn@microsoft.com>
* PublishingActivityReporter fixes * Introduce lock around status updates. * Lock on status updates. * Clean out unnecessary files from PR. * Extra file to remove. * Remove debugging code. --------- Co-authored-by: Mitch Denny <midenn@microsoft.com>
…#8599) Contributes to dotnet#7811 Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
* Address WithUrls feedback Fixes dotnet#8587 * Add more WithUrl tests * More tests * Fix test failure * Fix test * PR feedback --------- Co-authored-by: Damian Edwards <damian@damianedwards.com>
* Add RPC protocol compat check. (dotnet#8577) * Add RPC protocol compat check. * Fix merge conflict. * Fix spelling. * Update DotNetCliRunner.cs Co-authored-by: David Fowler <davidfowl@gmail.com> * Improve error message with version info. --------- Co-authored-by: David Fowler <davidfowl@gmail.com> * Fix --watch hangs. (dotnet#8585) * Fix --watch hangs. * Don't prebuild in watch mode. * Fix up merge. * Add watch/no-build conflict fix. * Fix spelling. * Spelling. --------- Co-authored-by: David Fowler <davidfowl@gmail.com>
…dpoints wrapped in connection strings were throwing during the preproces pass of the evalution. Avoid throwing during that pass - Added tests for this scenario (dotnet#8610) Fixes dotnet#8596 Co-authored-by: David Fowler <davidfowl@gmail.com>
…ent name as a prefix (dotnet#8607) * AddAzureContainerAppEnvironment should use the environment name as a prefix We should be prefixing the resources created via AddAzureContainerAppEnvironment with the environment name. This will allow for multiple environments to be in a single distributed application in the future. With this change, it means deploying to existing environments will duplicate resources. To solve that, add a new method WithAzdResourceNaming, which will revert the resource names back to the previous naming scheme. * Revert local testing changes * Ensure resourceToken is declared before it is used in bicep * Support volume names * Remove dots and dashes from the volume name to align with azd naming --------- Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Mitch Denny <midenn@microsoft.com>
… templates (dotnet#8644) * Filter out tracing health endpoints Fixes dotnet#8580 * Fix typo --------- Co-authored-by: Damian Edwards <damian@damianedwards.com>
* Obsolete AddAzureContainerAppsInfrastructure This method is no longer meant to be used. Instead developers should be calling AddAzureContainerAppEnvironment. Covert the tests using this API to the new API * Fix volume output naming issue We weren't discriminating between volumes and bindmounts, which caused a cache collision. * Switch the prefix at the beginning
…#8652) * Introduce version selecto to aspire new * Update src/Aspire.Cli/Commands/NewCommand.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Aspire.Cli/Commands/NewCommand.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Mitch Denny <midenn@microsoft.com> Co-authored-by: David Fowler <davidfowl@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…es (dotnet#8651) * Error out when GetCapabiltiesAsync is missing or unexpected exception occurs. * Update src/Aspire.Cli/DotNetCliRunner.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Mitch Denny <midenn@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…build 0.12.11 (dotnet#8660) Microsoft.DeveloperControlPlane.darwin-amd64 , Microsoft.DeveloperControlPlane.darwin-arm64 , Microsoft.DeveloperControlPlane.linux-amd64 , Microsoft.DeveloperControlPlane.linux-arm64 , Microsoft.DeveloperControlPlane.windows-386 , Microsoft.DeveloperControlPlane.windows-amd64 , Microsoft.DeveloperControlPlane.windows-arm64 From Version 0.12.9 -> To Version 0.12.11 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ages for 9.2 (dotnet#8654) * Updating versions of .NET Servicing and Extensions * Fix EndToEnd tests
Co-authored-by: Mitch Denny <midenn@microsoft.com>
…pove AddPublisher API. (dotnet#8666) Co-authored-by: Mitch Denny <midenn@microsoft.com>
joperezr
requested review from
eerhardt,
radical and
sebastienros
as code owners
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
Files not reviewed (9)
- eng/Signing.props: Language not supported
- eng/Version.Details.xml: Language not supported
- eng/Versions.props: Language not supported
- playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj: Language not supported
- src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj: Language not supported
- src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj: Language not supported
- src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets: Language not supported
- tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj: Language not supported
- tests/Aspire.OpenAI.Tests/Aspire.OpenAI.Tests.csproj: Language not supported
Member
Author
|
This PR should be merged and not squashed. |
github-actions
bot
added
the
area-integrations
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging changes from release/9.2 into main.