Skip to content

Merge branch release/9.3 into main #9394

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

Merged
merged 11 commits into from
May 19, 2025
Merged

Merge branch release/9.3 into main #9394

merged 11 commits into from
May 19, 2025

Conversation

joperezr
Copy link
Member

This should be merged and not squashed.

github-actions bot and others added 10 commits May 12, 2025 17:54
…9273)

* Fix visibility updates during resource upserts

* Add unit test

---------

Co-authored-by: Adam Ratzman <[email protected]>
…ord dosen't set in redis-server (dotnet#9283)

* Accept null value in Redis WithPassword to ensure password dosen't in redis-server

* Update tests/Aspire.Hosting.Redis.Tests/AddRedisTests.cs

* Apply suggestions from code review

* Fix manifest

* fix redis-insight test

* Update playground app manifest

* Update playground/Redis/Redis.AppHost/Program.cs

Co-authored-by: Eric Erhardt <[email protected]>

* Update src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs

Co-authored-by: Eric Erhardt <[email protected]>

* Revert manifest changes

---------

Co-authored-by: Alireza Baloochi <[email protected]>
Co-authored-by: David Fowler <[email protected]>
Co-authored-by: Eric Erhardt <[email protected]>
* Mark Publishing APIs as experimental

* AzurePublishingContext.MainInfrastructure should be a property.

* Adjust the namespaces of Aspire.Hosting.Azure classes.

* Make AddPublisher internal

* Mark ContainerRegistryReferenceAnnotation as experimental since IContainerRegistry is experimental.
* Enable stable branding for release 9.3

* Removing unnecessary reference

* Remove another unnecessary reference
* Fix Blazor error logging to telemetry

* Add logger

* Add test

* Fix build

* Add test for logging registration, add try/catch around sending error to telemetry

---------

Co-authored-by: James Newton-King <[email protected]>
…et#9330)

* Changing default SKU for App Service Plan to P0V3

* Removed TargetPort property from sitecontainer definition

* Updated manifest file for sample appservice project

* Updated the comments related to sidecar configuration

* Fixed failing AppService unit tests

---------

Co-authored-by: Shilpi Rachna <[email protected]>
* Bumping MEAI to stable 9.5.0 versions

* Pin 2 versions that are not shipping stable
@Copilot Copilot AI review requested due to automatic review settings May 19, 2025 17:51
@github-actions github-actions bot added the needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners label May 19, 2025
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR merges the release/9.3 branch into main and introduces changes for experimental API usage, updated warning suppressions, namespace consolidations, and revisions to project references.

  • Added Experimental attributes and adjusted warning suppression pragmas across several files.
  • Changed the accessibility of one builder extension and reorganized namespaces to align Azure modules.
  • Removed redundant project references in Azure-related project files.

Reviewed Changes

Copilot reviewed 28 out of 28 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/Aspire.Hosting/ResourceBuilderExtensions.cs Added an Experimental attribute to the publishing callback extension.
src/Aspire.Hosting/Publishing/PublishingContext.cs Introduced an Experimental attribute and additional using directive.
src/Aspire.Hosting/Publishing/Publisher.cs Added a warning suppression pragma for experimental API usage.
src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs Changed class and method accessibility from public to internal.
src/Aspire.Hosting/CompatibilitySuppressions.xml Added a new suppression entry for a previously experimental publisher component.
src/Aspire.Hosting/ApplicationModel/* Updated using directives and applied Experimental attributes where needed.
src/Aspire.Hosting.Azure/* Revised property definitions, adjusted namespace declarations, and removed outdated project references.
src/Aspire.Hosting.Docker/* Updated warning suppression pragmas to include experimental publisher APIs.
NuGet.config Added a new package source for dotnet-extensions.
Comments suppressed due to low confidence (3)

src/Aspire.Hosting.Azure.AppService/Aspire.Hosting.Azure.AppService.csproj:19

  • Removal of the container registry project reference may affect consumers relying on its presence. Verify that this change aligns with the intended module consolidation strategy.
<ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />

src/Aspire.Hosting.Azure.AppContainers/Aspire.Hosting.Azure.AppContainers.csproj:21

  • Removal of the container registry project reference might impact dependent modules; ensure this change is consistent with the overall project structure and consolidation efforts.
<ProjectReference Include="..\Aspire.Hosting.Azure.ContainerRegistry\Aspire.Hosting.Azure.ContainerRegistry.csproj" />

src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs:12

  • Changing the accessibility of the PublisherDistributedApplicationBuilderExtensions class from public to internal may limit its discoverability for external users. Confirm that this change was intentional and update the related documentation if necessary.
internal static class PublisherDistributedApplicationBuilderExtensions

NuGet.config Outdated
@@ -17,6 +17,7 @@
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet-extensions" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-988e9ee7/nuget/v3/index.json" />
Copy link
Member

Choose a reason for hiding this comment

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

Do we need this anymore? The packages we consume should be in dotnet-public.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes sorry was in the middle of fixing this and got inti a meeting. Will push the fixes shortly

@@ -33,7 +33,7 @@
`AspireProjectOrPackageReference` - maps to projects in `src/` or `src/Components/`
-->

<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="$(PackageVersion)" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
<Import Project="Sdk.props" Sdk="Aspire.AppHost.Sdk" Version="9.3.0" Condition="'$(IsAspireHost)' == 'true' and '$(RepoRoot)' == '' and '$(TestsRunningOutsideOfRepo)' == 'true'" />
Copy link
Member

Choose a reason for hiding this comment

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

This file should be reverted.

<PackageVersion Include="Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Confluent.Kafka" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Elastic.Clients.Elasticsearch" Version="$(PackageVersion)" />
<PackageVersion Include="Aspire.Azure.Data.Tables" Version="9.3.0" />
Copy link
Member

Choose a reason for hiding this comment

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

This file should be reverted.

Copy link
Member

@eerhardt eerhardt left a comment

Choose a reason for hiding this comment

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

LGTM

@joperezr joperezr merged commit 3ede82b into dotnet:main May 19, 2025
254 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jun 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-area-label An area label is needed to ensure this gets routed to the appropriate area owners
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants