From ad11dd7402f0fa331f1b4eeb3f3d0fb4764c2845 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 11 Jun 2024 16:55:51 +0000 Subject: [PATCH 1/2] Merged PR 40267: Preparing for 8.6 release Preparing for 8.6 release --- Directory.Build.props | 5 +++ NuGet.config | 54 ++++++++++++++---------- azure-pipelines.yml | 45 -------------------- eng/Version.Details.xml | 34 +++++++-------- eng/Versions.props | 18 ++++++-- eng/pipelines/templates/BuildAndTest.yml | 18 ++++++++ 6 files changed, 86 insertions(+), 88 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index cea28e22ade..850685ca2d7 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 92c91acc4ce..343f37880d5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,24 @@ + + + + + + + + + + + + + + + + @@ -17,33 +33,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dbea1c85754..ae3ba1a26af 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -213,50 +213,6 @@ extends: isWindows: false warnAsError: 0 - # ---------------------------------------------------------------- - # 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 @@ -313,7 +269,6 @@ extends: parameters: validateDependsOn: - build - - codecoverage - correctness publishingInfraVersion: 3 enableSymbolValidation: false diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b42c15bbe87..3d814865ee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,9 +12,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -98,7 +98,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -108,33 +108,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 714a9761f995103a6cdf21a7c41041740293bae9 diff --git a/eng/Versions.props b/eng/Versions.props index 2e30c2762aa..07d0e2315cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,9 @@ 8 - 6 + 5 0 - preview + rtm $(MajorVersion).$(MinorVersion).$(PatchVersion) @@ -11,8 +11,11 @@ $(MajorVersion).$(MinorVersion).0.0 - + release true @@ -33,6 +36,7 @@ 8.0.0 8.0.0 8.0.1 + 8.0.0 8.0.0 8.0.0 8.0.1 @@ -46,22 +50,28 @@ 8.0.0 8.0.0 8.0.0 + 8.0.0 8.0.2 + 8.0.0 8.0.0 8.0.0 8.0.1 8.0.0 8.0.0 - 8.0.0 + 8.0.0 8.0.0 8.0.1 8.0.0 + 8.0.3 + 8.0.0 8.0.5 8.0.5 8.0.5 8.0.5 + 8.0.5 8.0.5 + 8.0.5 8.0.5 8.0.5 diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml index ced3ce0afb3..110020bc4e7 100644 --- a/eng/pipelines/templates/BuildAndTest.yml +++ b/eng/pipelines/templates/BuildAndTest.yml @@ -23,6 +23,24 @@ parameters: default: false steps: + - 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 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + arguments: $(Build.SourcesDirectory)/NuGet.config $Token + condition: ne(variables['Agent.OS'], 'Windows_NT') + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: ${{ parameters.buildScript }} -restore /bl:${{ parameters.repoLogPath }}/restore.binlog From 7843c7bd1c77ac0ea6768a3e23771cf2a1236135 Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Tue, 11 Jun 2024 17:49:24 +0000 Subject: [PATCH 2/2] Merged PR 40274: Fix minor version Fix minor version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 07d0e2315cf..9c74610db47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ 8 - 5 + 6 0 rtm