From 9e8d935cf0e7014d338ebdb7d6d7d4d348d62021 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Mon, 8 Dec 2025 17:23:53 +0000 Subject: [PATCH] Merged PR 55833: Preapre for 10.1 release Preapre for 10.1 release ---- #### AI description (iteration 1) #### PR Classification This pull request prepares the project for the 10.1 release by updating dependency versions and build configurations for a stable shipping build. #### PR Summary The changes update package versions and streamline build pipelines to ensure a stable, release-ready output: - **`eng/Versions.props`**: Bumped dependency versions from 10.0.0 to 10.0.1 and enabled release stabilization by setting `` to true and `` to release. - **`azure-pipelines.yml`**: Removed the code coverage stage and updated dependency triggers to simplify the CI pipeline. - **`NuGet.config`**: Removed the package source mapping section and added a new internal package source reference. - **`eng/pipelines/templates/BuildAndTest.yml` & `Directory.Build.props`**: Added tasks to set up private feed credentials and disabled NU1507 warnings to support internal feeds. --- Directory.Build.props | 5 + NuGet.config | 24 +--- azure-pipelines.yml | 46 -------- eng/Versions.props | 106 +++++++++--------- eng/packages/TestOnly.props | 1 + eng/pipelines/templates/BuildAndTest.yml | 32 ++++-- ...soft.Extensions.DataIngestion.Tests.csproj | 2 + ...Extensions.Diagnostics.Probes.Tests.csproj | 1 + 8 files changed, 89 insertions(+), 128 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 38fbb2c0850..213d4b272b6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,6 +34,11 @@ $(NetCoreTargetFrameworks) + + + $(NoWarn);NU1507 + + false latest diff --git a/NuGet.config b/NuGet.config index 0fedd015e82..b85c9c471bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -18,28 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -47,6 +26,7 @@ + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 84f7b718576..59fbfbf7405 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -256,51 +256,6 @@ extends: skipQualityGates: ${{ eq(variables['SkipQualityGates'], 'true') }} isWindows: false - # ---------------------------------------------------------------- - # This stage performs quality gates enforcements - # ---------------------------------------------------------------- - - stage: codecoverage - displayName: CodeCoverage - dependsOn: - - build - condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true')) - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml@self - jobs: - - template: /eng/common/templates-official/jobs/jobs.yml@self - parameters: - enableMicrobuild: true - enableTelemetry: true - runAsPublic: ${{ variables['runAsPublic'] }} - workspace: - clean: all - - # ---------------------------------------------------------------- - # This stage downloads the code coverage reports from the build jobs, - # merges those and validates the combined test coverage. - # ---------------------------------------------------------------- - jobs: - - job: CodeCoverageReport - timeoutInMinutes: 180 - - pool: - name: NetCore1ESPool-Internal - image: 1es-mariner-2 - os: linux - - preSteps: - - checkout: self - clean: true - persistCredentials: true - fetchDepth: 1 - - steps: - - script: $(Build.SourcesDirectory)/build.sh --ci --restore - displayName: Init toolset - - - template: /eng/pipelines/templates/VerifyCoverageReport.yml - - # ---------------------------------------------------------------- # This stage only performs a build treating warnings as errors # to detect any kind of code style violations @@ -356,7 +311,6 @@ extends: parameters: validateDependsOn: - build - - codecoverage - correctness publishingInfraVersion: 3 enableSymbolValidation: false diff --git a/eng/Versions.props b/eng/Versions.props index f42eb55d01b..aed94a55e30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,14 +10,14 @@ - false + true - + release true @@ -90,60 +90,60 @@ - 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 - 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 - 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 - 10.0.0 - 10.0.0 - 10.0.0 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 - 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.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 - 10.0.0 + 10.0.1 - 10.0.0-beta.25523.111 + 10.0.0-beta.25569.105 diff --git a/eng/packages/TestOnly.props b/eng/packages/TestOnly.props index 513f82789d9..b1c041881b0 100644 --- a/eng/packages/TestOnly.props +++ b/eng/packages/TestOnly.props @@ -6,6 +6,7 @@ + diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml index ce540adfa24..8df9a2bede6 100644 --- a/eng/pipelines/templates/BuildAndTest.yml +++ b/eng/pipelines/templates/BuildAndTest.yml @@ -28,6 +28,23 @@ steps: inputs: versionSpec: "20.x" checkLatest: true + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + condition: eq(variables['Agent.OS'], 'Windows_NT') + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + + - task: Bash@3 + displayName: Setup Private Feeds Credentials + condition: ne(variables['Agent.OS'], 'Windows_NT') + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) - script: ${{ parameters.buildScript }} -restore @@ -70,13 +87,14 @@ steps: displayName: Pack - ${{ if ne(parameters.skipTests, 'true') }}: - - script: ${{ parameters.buildScript }} - -integrationTest - -configuration ${{ parameters.buildConfig }} - -warnAsError ${{ parameters.warnAsError }} - /bl:${{ parameters.repoLogPath }}/integration_tests.binlog - $(_OfficialBuildIdArgs) - displayName: Run integration tests + # Skipping integration tests for now as they require authentication to the private feeds + # - script: ${{ parameters.buildScript }} + # -integrationTest + # -configuration ${{ parameters.buildConfig }} + # -warnAsError 1 + # /bl:${{ parameters.repoLogPath }}/integration_tests.binlog + # $(_OfficialBuildIdArgs) + # displayName: Run integration tests - pwsh: | $SourcesDirectory = '$(Build.SourcesDirectory)'; diff --git a/test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj b/test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj index cc64014cad6..b8ac1b8e7f0 100644 --- a/test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj +++ b/test/Libraries/Microsoft.Extensions.DataIngestion.Tests/Microsoft.Extensions.DataIngestion.Tests.csproj @@ -25,6 +25,8 @@ + + diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Microsoft.Extensions.Diagnostics.Probes.Tests.csproj b/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Microsoft.Extensions.Diagnostics.Probes.Tests.csproj index 5f6ca415e12..6e1c0cdf3fb 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Microsoft.Extensions.Diagnostics.Probes.Tests.csproj +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.Probes.Tests/Microsoft.Extensions.Diagnostics.Probes.Tests.csproj @@ -18,6 +18,7 @@ +