From c0272f802c367181e6118c1e54b42695526c1e3f Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 7 Nov 2025 02:26:04 +0000 Subject: [PATCH 1/5] Merged PR 54985: Stabilizing packages and preparing for 13.0 release #### AI description (iteration 1) #### PR Classification This pull request stabilizes dependency versions and updates package configurations in preparation for the 13.0 release. #### PR Summary The PR upgrades Microsoft and Aspire dependency versions to their stable releases, removes pre-release tags, and adjusts CI and pipeline setups to support the new release. Key changes include: - **`eng/Version.Details.xml`**: Upgraded various Microsoft dependencies (e.g., AutoActivation, Http.Resilience, ServiceDiscovery) from RC or older stable versions to 10.0.0/9.0.11 and added new AI-related dependencies. - **`tests/Shared/RepoTesting/Directory.Packages.Helix.props` & Aspire.RepoTesting.targets**: Bumped Aspire package versions from a variable to a fixed 13.0.0 to align with the upcoming release. - **`eng/Versions.props`**: Updated preview and current .NET dependency versions to stable numbers, switched the stabilization flag to true, and bumped LTS versions from 8.0.21 to 8.0.22. - **`NuGet.config` & CI workflow files**: Revised package source mappings, removed the custom version suffix computation, and streamlined feed configurations. - **Pipeline and build configuration files** (`BuildAndTest.yml`, `Directory.Build.props`, `Directory.Packages.props`): Added tasks for setting up private feed credentials and disabled source mapping warnings for internal branches. --- .github/workflows/ci.yml | 19 --- Directory.Build.props | 5 + Directory.Packages.props | 6 +- NuGet.config | 44 +++-- eng/Version.Details.xml | 148 +++++++++------- eng/Versions.props | 159 +++++++++--------- eng/pipelines/templates/BuildAndTest.yml | 35 ++-- eng/pipelines/templates/build_sign_native.yml | 1 + ...gsql.EntityFrameworkCore.PostgreSQL.csproj | 7 + ...gsql.EntityFrameworkCore.PostgreSQL.csproj | 7 + ...ntityFrameworkCore.PostgreSQL.Tests.csproj | 5 + ...ntityFrameworkCore.PostgreSQL.Tests.csproj | 5 + .../RepoTesting/Aspire.RepoTesting.targets | 4 +- .../Directory.Packages.Helix.props | 138 +++++++-------- 14 files changed, 306 insertions(+), 277 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2583d2e269a..006d1a8c78b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,25 +41,6 @@ jobs: \.md$ eng/pipelines/.* - - id: compute_version_suffix - name: Compute version suffix for PRs - if: ${{ github.event_name == 'pull_request' }} - shell: pwsh - env: - # Use the pull request head SHA instead of GITHUB_SHA (which can be a merge commit) - PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - PR_NUMBER: ${{ github.event.number }} - run: | - Write-Host "Determining VERSION_SUFFIX_OVERRIDE (PR only step)..." - if ([string]::IsNullOrWhiteSpace($Env:PR_HEAD_SHA)) { - Write-Error "PR_HEAD_SHA not set; cannot compute version suffix." - exit 1 - } - $SHORT_SHA = $Env:PR_HEAD_SHA.Substring(0,8) - $VERSION_SUFFIX = "/p:VersionSuffix=pr.$($Env:PR_NUMBER).g$SHORT_SHA" - Write-Host "Computed VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX" - "VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX" | Out-File -FilePath $Env:GITHUB_OUTPUT -Append -Encoding utf8 - tests: uses: ./.github/workflows/tests.yml name: Tests diff --git a/Directory.Build.props b/Directory.Build.props index 0437ca9758e..3e2af8824af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -42,6 +42,11 @@ $(NoWarn);xUnit1051;NU1510 + + + $(NoWarn);NU1507 + + linux diff --git a/Directory.Packages.props b/Directory.Packages.props index d2105813825..f054e00dd74 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -105,7 +105,7 @@ - + @@ -171,8 +171,8 @@ - - + + diff --git a/NuGet.config b/NuGet.config index bae60ec60c9..0f08269f1fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,13 +3,23 @@ + + + + + + + + + + @@ -19,39 +29,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35397b4888d..b887cd20aef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -33,129 +33,149 @@ https://github.com/microsoft/usvc-apiserver 518dd532b47521a52dff9d1c9ba4639229f39953 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - f8f779a6ea004bb1f26649719ca77d63a9d9417c + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - f8f779a6ea004bb1f26649719ca77d63a9d9417c + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - - https://github.com/dotnet/extensions - 6218df0ffff86df912bd2035854c80480476e803 + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - - https://github.com/dotnet/extensions - 6218df0ffff86df912bd2035854c80480476e803 + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - f8f779a6ea004bb1f26649719ca77d63a9d9417c + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - f8f779a6ea004bb1f26649719ca77d63a9d9417c + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5452ff90a79084afd23df379388ae8bca24284f3 + f55fe13550b5f821336abb63ef5ac454ce4de5fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5452ff90a79084afd23df379388ae8bca24284f3 + f55fe13550b5f821336abb63ef5ac454ce4de5fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5452ff90a79084afd23df379388ae8bca24284f3 + f55fe13550b5f821336abb63ef5ac454ce4de5fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 5452ff90a79084afd23df379388ae8bca24284f3 + f55fe13550b5f821336abb63ef5ac454ce4de5fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5bae930797f60d2d04f3b1df6a33eaca85fc5f28 + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + fa7cdded37981a97cec9a3e233c4a6af58a91c57 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + + + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions + 05fe7a56d35c4a766618d56e0dc9c405d33a8afd diff --git a/eng/Versions.props b/eng/Versions.props index 074759ca1c9..8d1be863c16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,7 +21,7 @@ 1.8.4 17.14.1 - false + true release @@ -41,14 +41,15 @@ 11.0.0-beta.25509.1 11.0.0-beta.25509.1 - 9.10.1 - 9.10.0-preview.1.25513.3 - 9.10.0 - 9.10.0 - 9.10.0 - 9.10.0 - 9.5.2 - 9.5.2 + 10.0.0 + 10.0.0-preview.1.25555.8 + 10.0.0-preview.1.25555.8 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 2.1.1 @@ -57,68 +58,68 @@ - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 - 10.0.0-rc.2.25502.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 - 9.0.10 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 1.13.0 1.13.0 @@ -129,23 +130,23 @@ - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 - 8.0.21 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 + 8.0.22 8.0.1 8.0.1 diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml index 02b0cce611e..4562f04659b 100644 --- a/eng/pipelines/templates/BuildAndTest.yml +++ b/eng/pipelines/templates/BuildAndTest.yml @@ -30,6 +30,7 @@ parameters: default: '28.0.0' steps: + - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self # Internal pipeline: Build with pack+sign - ${{ if ne(parameters.runAsPublic, 'true') }}: - script: ${{ parameters.buildScript }} @@ -59,23 +60,23 @@ steps: /p:SkipPackageCheckForTemplatesTesting=true displayName: 🟣Prepare sdks for templates testing - - script: ${{ parameters.buildScript }} - -build - -restore - -test - -configuration ${{ parameters.buildConfig }} - /bl:${{ parameters.repoLogPath }}/BuildTemplatesTests.binlog - $(_OfficialBuildIdArgs) - $(_InternalBuildArgs) - /p:SkipTests=false - -projects $(Build.SourcesDirectory)\tests\Aspire.Templates.Tests\Aspire.Templates.Tests.csproj - env: - RunOnlyBasicBuildTemplateTests: true - # test root path for template test projects - DEV_TEMP: $(Build.SourcesDirectory)\.. - DOTNET_ROOT: $(Build.SourcesDirectory)\.dotnet - TEST_LOG_PATH: $(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Aspire.Templates.Tests - displayName: 🟣Run Template tests + # - script: ${{ parameters.buildScript }} + # -build + # -restore + # -test + # -configuration ${{ parameters.buildConfig }} + # /bl:${{ parameters.repoLogPath }}/BuildTemplatesTests.binlog + # $(_OfficialBuildIdArgs) + # $(_InternalBuildArgs) + # /p:SkipTests=false + # -projects $(Build.SourcesDirectory)\tests\Aspire.Templates.Tests\Aspire.Templates.Tests.csproj + # env: + # RunOnlyBasicBuildTemplateTests: true + # # test root path for template test projects + # DEV_TEMP: $(Build.SourcesDirectory)\.. + # DOTNET_ROOT: $(Build.SourcesDirectory)\.dotnet + # TEST_LOG_PATH: $(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Aspire.Templates.Tests + # displayName: 🟣Run Template tests # Public pipeline - helix tests - ${{ if eq(parameters.runAsPublic, 'true') }}: diff --git a/eng/pipelines/templates/build_sign_native.yml b/eng/pipelines/templates/build_sign_native.yml index 1bcf20b0d5f..3491a0f6cf5 100644 --- a/eng/pipelines/templates/build_sign_native.yml +++ b/eng/pipelines/templates/build_sign_native.yml @@ -54,6 +54,7 @@ jobs: - checkout: self fetchDepth: 1 clean: true + - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self # Installing Microbuild plugin fails due to https://github.com/dotnet/arcade/issues/15946#issuecomment-3045780552 # because of the preview sdk. To fix that `restore` from `global.json` so the above step diff --git a/src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj b/src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj index 6993a7cd53c..fdcbc9ee3e1 100644 --- a/src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj +++ b/src/Components/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.csproj @@ -7,8 +7,15 @@ An Azure Database for PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry. $(SharedDir)AzurePostgreSQL_256x.png false + + true + + + + + diff --git a/src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj b/src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj index bf842aaf054..8c0bd0f5c40 100644 --- a/src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj +++ b/src/Components/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.csproj @@ -6,6 +6,8 @@ $(ComponentEfCorePackageTags) postgressql postgres npgsql sql A PostgreSQL® provider for Entity Framework Core that integrates with Aspire, including connection pooling, health checks, logging, and telemetry. $(SharedDir)PostgreSQL_logo.3colors.540x557.png + + true @@ -15,6 +17,11 @@ + + + + + diff --git a/tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj b/tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj index 72299adf467..0657a47c52f 100644 --- a/tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj +++ b/tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Azure.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj @@ -22,6 +22,11 @@ + + + + + diff --git a/tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj b/tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj index a8a7701f9eb..e91138adebb 100644 --- a/tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj +++ b/tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj @@ -16,6 +16,11 @@ + + + + + diff --git a/tests/Shared/RepoTesting/Aspire.RepoTesting.targets b/tests/Shared/RepoTesting/Aspire.RepoTesting.targets index f2752fb32d9..aadd783ff68 100644 --- a/tests/Shared/RepoTesting/Aspire.RepoTesting.targets +++ b/tests/Shared/RepoTesting/Aspire.RepoTesting.targets @@ -33,7 +33,7 @@ `AspireProjectOrPackageReference` - maps to projects in `src/` or `src/Components/` --> - + @@ -157,6 +157,6 @@ $(MajorVersion).$(MinorVersion).$(PatchVersion) - + diff --git a/tests/Shared/RepoTesting/Directory.Packages.Helix.props b/tests/Shared/RepoTesting/Directory.Packages.Helix.props index 5428992b1ba..13c52d3aed2 100644 --- a/tests/Shared/RepoTesting/Directory.Packages.Helix.props +++ b/tests/Shared/RepoTesting/Directory.Packages.Helix.props @@ -3,81 +3,81 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + From 4bc14f257a1950abf8cd4707c6a2110ec6b22745 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 8 Nov 2025 10:40:46 -0800 Subject: [PATCH 2/5] Bumping the version of extensions we depend on and addressing breaking changes --- Directory.Packages.props | 2 +- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++---------- eng/Versions.props | 4 ++-- .../AzureAIFoundryEndToEnd.WebStory.csproj | 3 +++ .../AzureOpenAIEndToEnd.WebStory.csproj | 3 +++ .../GitHubModelsEndToEnd.WebStory.csproj | 3 +++ .../OpenAIEndToEnd.WebStory.csproj | 3 +++ src/Aspire.Dashboard/Aspire.Dashboard.csproj | 9 ++++++++ .../Aspire.Azure.AI.Inference.csproj | 2 ++ .../Aspire.Azure.AI.OpenAI.csproj | 2 ++ .../Aspire.OpenAI/Aspire.OpenAI.csproj | 2 ++ .../Aspire.Azure.AI.Inference.Tests.csproj | 3 +++ .../Aspire.Azure.AI.OpenAI.Tests.csproj | 3 +++ .../Aspire.Dashboard.Components.Tests.csproj | 8 +++++++ .../Aspire.Dashboard.Tests.csproj | 8 +++++++ .../Aspire.OpenAI.Tests.csproj | 3 +++ 17 files changed, 68 insertions(+), 16 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f054e00dd74..57511d0f1b1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -245,7 +245,7 @@ - + diff --git a/NuGet.config b/NuGet.config index 0f08269f1fd..25ea42a2c99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b887cd20aef..09c93f7789d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,27 +35,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -167,15 +167,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - 05fe7a56d35c4a766618d56e0dc9c405d33a8afd + ea69fdea45ab2f505608ec9218315a092def86b5 diff --git a/eng/Versions.props b/eng/Versions.props index 8d1be863c16..049302ed0d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ 11.0.0-beta.25509.1 10.0.0 - 10.0.0-preview.1.25555.8 - 10.0.0-preview.1.25555.8 + 10.0.0-preview.1.25558.1 + 10.0.0-preview.1.25558.1 10.0.0 10.0.0 10.0.0 diff --git a/playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj b/playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj index aa19fad6805..cd25e05445f 100644 --- a/playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj +++ b/playground/AzureAIFoundryEndToEnd/AzureAIFoundryEndToEnd.WebStory/AzureAIFoundryEndToEnd.WebStory.csproj @@ -4,6 +4,9 @@ $(DefaultTargetFramework) enable enable + + + true diff --git a/playground/AzureOpenAIEndToEnd/AzureOpenAIEndToEnd.WebStory/AzureOpenAIEndToEnd.WebStory.csproj b/playground/AzureOpenAIEndToEnd/AzureOpenAIEndToEnd.WebStory/AzureOpenAIEndToEnd.WebStory.csproj index ede52a85213..cefd34325a6 100644 --- a/playground/AzureOpenAIEndToEnd/AzureOpenAIEndToEnd.WebStory/AzureOpenAIEndToEnd.WebStory.csproj +++ b/playground/AzureOpenAIEndToEnd/AzureOpenAIEndToEnd.WebStory/AzureOpenAIEndToEnd.WebStory.csproj @@ -4,6 +4,9 @@ $(DefaultTargetFramework) enable enable + + + true diff --git a/playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.WebStory/GitHubModelsEndToEnd.WebStory.csproj b/playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.WebStory/GitHubModelsEndToEnd.WebStory.csproj index aa19fad6805..cd25e05445f 100644 --- a/playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.WebStory/GitHubModelsEndToEnd.WebStory.csproj +++ b/playground/GitHubModelsEndToEnd/GitHubModelsEndToEnd.WebStory/GitHubModelsEndToEnd.WebStory.csproj @@ -4,6 +4,9 @@ $(DefaultTargetFramework) enable enable + + + true diff --git a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj index 09cbf34f233..3f5a6a52980 100644 --- a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj +++ b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj @@ -4,6 +4,9 @@ $(DefaultTargetFramework) enable enable + + + true diff --git a/src/Aspire.Dashboard/Aspire.Dashboard.csproj b/src/Aspire.Dashboard/Aspire.Dashboard.csproj index 88e1d6eaf25..e9cd79e4488 100644 --- a/src/Aspire.Dashboard/Aspire.Dashboard.csproj +++ b/src/Aspire.Dashboard/Aspire.Dashboard.csproj @@ -61,6 +61,15 @@ + + + + + + + + + diff --git a/src/Components/Aspire.Azure.AI.Inference/Aspire.Azure.AI.Inference.csproj b/src/Components/Aspire.Azure.AI.Inference/Aspire.Azure.AI.Inference.csproj index 7926621c583..7370e834905 100644 --- a/src/Components/Aspire.Azure.AI.Inference/Aspire.Azure.AI.Inference.csproj +++ b/src/Components/Aspire.Azure.AI.Inference/Aspire.Azure.AI.Inference.csproj @@ -9,6 +9,8 @@ $(NoWarn);SYSLIB1100;SYSLIB1101 true + + true diff --git a/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj b/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj index db2deffe6bc..99d48574b2e 100644 --- a/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj +++ b/src/Components/Aspire.Azure.AI.OpenAI/Aspire.Azure.AI.OpenAI.csproj @@ -10,6 +10,8 @@ $(NoWarn);SYSLIB1100;SYSLIB1101;AOAI001 true + + true diff --git a/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj b/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj index 6734335bac1..418225a47c1 100644 --- a/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj +++ b/src/Components/Aspire.OpenAI/Aspire.OpenAI.csproj @@ -8,6 +8,8 @@ $(NoWarn);SYSLIB1100;SYSLIB1101 true + + true diff --git a/tests/Aspire.Azure.AI.Inference.Tests/Aspire.Azure.AI.Inference.Tests.csproj b/tests/Aspire.Azure.AI.Inference.Tests/Aspire.Azure.AI.Inference.Tests.csproj index 948e92b0096..cca72f73ac9 100644 --- a/tests/Aspire.Azure.AI.Inference.Tests/Aspire.Azure.AI.Inference.Tests.csproj +++ b/tests/Aspire.Azure.AI.Inference.Tests/Aspire.Azure.AI.Inference.Tests.csproj @@ -2,6 +2,9 @@ $(AllTargetFrameworks) + + + true diff --git a/tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj b/tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj index 4dbaaba1306..a8846feaeb0 100644 --- a/tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj +++ b/tests/Aspire.Azure.AI.OpenAI.Tests/Aspire.Azure.AI.OpenAI.Tests.csproj @@ -2,6 +2,9 @@ $(AllTargetFrameworks) + + + true diff --git a/tests/Aspire.Dashboard.Components.Tests/Aspire.Dashboard.Components.Tests.csproj b/tests/Aspire.Dashboard.Components.Tests/Aspire.Dashboard.Components.Tests.csproj index 6ad04560641..35cc80cd95f 100644 --- a/tests/Aspire.Dashboard.Components.Tests/Aspire.Dashboard.Components.Tests.csproj +++ b/tests/Aspire.Dashboard.Components.Tests/Aspire.Dashboard.Components.Tests.csproj @@ -14,6 +14,14 @@ + + + + + + + + diff --git a/tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj b/tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj index 6e86300a910..6c8facb4615 100644 --- a/tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj +++ b/tests/Aspire.Dashboard.Tests/Aspire.Dashboard.Tests.csproj @@ -22,6 +22,14 @@ + + + + + + + + diff --git a/tests/Aspire.OpenAI.Tests/Aspire.OpenAI.Tests.csproj b/tests/Aspire.OpenAI.Tests/Aspire.OpenAI.Tests.csproj index 3c3198e1f6e..7cbe37e8511 100644 --- a/tests/Aspire.OpenAI.Tests/Aspire.OpenAI.Tests.csproj +++ b/tests/Aspire.OpenAI.Tests/Aspire.OpenAI.Tests.csproj @@ -2,6 +2,9 @@ $(AllTargetFrameworks) + + + true From 0a54b7f391982b015430c0184223fbd641079f67 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Sat, 8 Nov 2025 14:17:53 -0800 Subject: [PATCH 3/5] Fix playground app --- .../OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj index 3f5a6a52980..2df50b9502b 100644 --- a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj +++ b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/OpenAIEndToEnd.WebStory.csproj @@ -9,6 +9,11 @@ true + + + + + From 5f970c5081f18419709449d2947e03ae338c8452 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 10 Nov 2025 10:18:28 -0800 Subject: [PATCH 4/5] Update to latest dotnet/extensions --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25ea42a2c99..316ac2d6f06 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09c93f7789d..578c64c7f01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,27 +35,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -167,15 +167,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - ea69fdea45ab2f505608ec9218315a092def86b5 + fbd393616ef5ce0f2f1521a7250e4311728ed93a diff --git a/eng/Versions.props b/eng/Versions.props index 049302ed0d6..ed1c42be71a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,8 +42,8 @@ 11.0.0-beta.25509.1 10.0.0 - 10.0.0-preview.1.25558.1 - 10.0.0-preview.1.25558.1 + 10.0.0-preview.1.25559.3 + 10.0.0-preview.1.25559.3 10.0.0 10.0.0 10.0.0 From 445e51a21c156f69544ac78d716a63a01ba559b2 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 11 Nov 2025 08:46:52 -0800 Subject: [PATCH 5/5] Fix NpgSQL end-to-end tests --- tests/Shared/RepoTesting/Directory.Packages.Helix.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Shared/RepoTesting/Directory.Packages.Helix.props b/tests/Shared/RepoTesting/Directory.Packages.Helix.props index 13c52d3aed2..ff0ff0453cc 100644 --- a/tests/Shared/RepoTesting/Directory.Packages.Helix.props +++ b/tests/Shared/RepoTesting/Directory.Packages.Helix.props @@ -11,7 +11,7 @@ - + @@ -68,7 +68,7 @@ - +