From 46d6bcadda9cc9f81f596dd67b8ffac1ac6782ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:30:26 +0000 Subject: [PATCH 01/22] Update dependencies from https://github.com/dotnet/aspnetcore build 20240811.2 (#5349) Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 9.0.0-rc.1.24409.11 -> To Version 9.0.0-rc.1.24411.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 64bd53bad00..b5d4da46115 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -128,37 +128,37 @@ https://github.com/dotnet/runtime 0f2ce100fb386fec5eb784cf501ee95881a14e47 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 - + https://github.com/dotnet/aspnetcore - bbad0917b40fe9ffc0d26467441739f5853ed643 + e9647658dc46260cce21e980ec324565a4d39293 diff --git a/eng/Versions.props b/eng/Versions.props index 6ef9d108d43..46f23ef5ff0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,14 +60,14 @@ 9.0.0-rc.1.24409.1 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 - 9.0.0-rc.1.24409.11 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24411.2 + + $(NoWarn);NU1507 + + false latest diff --git a/NuGet.config b/NuGet.config index 761dd5478cf..7a28c23679b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,8 @@ - - - - - + + @@ -27,36 +24,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c8ab2149b97..3da5b47240a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -141,7 +141,7 @@ extends: parameters: enableMicrobuild: true enableTelemetry: true - enableSourceIndex: true + enableSourceIndex: false runAsPublic: ${{ variables['runAsPublic'] }} # Publish build logs enablePublishBuildArtifacts: true @@ -218,51 +218,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 # to detect any kind of code style violations @@ -318,7 +273,6 @@ extends: parameters: validateDependsOn: - build - - codecoverage - correctness publishingInfraVersion: 3 enableSymbolValidation: false diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02a2148d2e2..f8727686e5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,33 +108,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 diff --git a/eng/Versions.props b/eng/Versions.props index 80da5173855..38ae29f6a23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 8 8 0 - preview + rtm $(MajorVersion).$(MinorVersion).$(PatchVersion) @@ -11,8 +11,11 @@ $(MajorVersion).$(MinorVersion).0.0 - + release true @@ -62,15 +65,15 @@ 8.0.3 8.0.0 - 8.0.7 - 8.0.7 - 8.0.7 - 8.0.7 + 8.0.8 + 8.0.8 + 8.0.8 + 8.0.8 8.0.5 - 8.0.7 + 8.0.8 8.0.5 - 8.0.7 - 8.0.7 + 8.0.8 + 8.0.8 - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/runtime - 0f2ce100fb386fec5eb784cf501ee95881a14e47 + 7cb32e193a55a95c74fc3bd56501b951b48b700f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f - + https://github.com/dotnet/aspnetcore - e9647658dc46260cce21e980ec324565a4d39293 + abbd67b97144c14ef60cdeb416ad9c5d75356c7f diff --git a/eng/Versions.props b/eng/Versions.props index 46f23ef5ff0..f1fbb0e39e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,46 +28,46 @@ --> - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 - 9.0.0-rc.1.24409.1 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 - 9.0.0-rc.1.24411.2 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24412.15 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/runtime - 7cb32e193a55a95c74fc3bd56501b951b48b700f + 05abb765e2740d7182c56e142fbe44d76fafedf4 - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d - + https://github.com/dotnet/aspnetcore - abbd67b97144c14ef60cdeb416ad9c5d75356c7f + 08b60af1bca8cffff8ba0a72164fb7505ffe114d diff --git a/eng/Versions.props b/eng/Versions.props index f1fbb0e39e5..cdc67ae9b01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,46 +28,46 @@ --> - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 - 9.0.0-rc.1.24410.5 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 - 9.0.0-rc.1.24412.15 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 - 9.0.0-rc.1.24413.14 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 + 9.0.0-rc.1.24414.4 - false - $(NoWarn);IL2026 From 44c903e51545088b55f02e5fe0062bfd5c64ec7e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 19 Aug 2024 12:07:45 +0000 Subject: [PATCH 15/22] Update .NET SDK Update .NET SDK to version 9.0.100-rc.1.24419.12. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 03d0ae80f03..737a4ea15d3 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.100-rc.1.24409.1" + "version": "9.0.100-rc.1.24419.12" }, "tools": { - "dotnet": "9.0.100-rc.1.24409.1", + "dotnet": "9.0.100-rc.1.24419.12", "runtimes": { "dotnet/x64": [ "8.0.0", From 6e0195db97d66cdf082e32799858c34bf5fd0cdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:30:07 +0000 Subject: [PATCH 16/22] Update dependencies from https://github.com/dotnet/arcade build 20240813.2 (#5373) [main] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8727686e5d..7de512b98a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -138,13 +138,13 @@ - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 51321b7e150a2f426cb9e1334687bdfab68ec323 diff --git a/global.json b/global.json index 2ab665c2899..34032fd52e4 100644 --- a/global.json +++ b/global.json @@ -16,7 +16,7 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24376.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24413.2" } } From 16d9ea74895bad452aad28f7bc936f699d94172e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:40:33 +0000 Subject: [PATCH 17/22] Update dependencies from https://github.com/dotnet/arcade build 20240816.2 (#5374) [dev] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2736d64b7e..349668188ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -162,13 +162,13 @@ - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 8fe02bab989df1265eee225df2c28af6dbdccc83 - + https://github.com/dotnet/arcade - 60ae233c3d77f11c5fdb53e570b64d503b13ba59 + 8fe02bab989df1265eee225df2c28af6dbdccc83 diff --git a/global.json b/global.json index 03d0ae80f03..44c80ba9ce2 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24408.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24416.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24416.2" } } From 6376822ac1ec80cf8a96518b8c2dd53ec81dddd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:34:12 +0200 Subject: [PATCH 18/22] [dev] Update dependencies from dotnet/aspnetcore (#5371) * Update dependencies from https://github.com/dotnet/aspnetcore build 20240816.8 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 9.0.0-rc.1.24414.4 -> To Version 10.0.0-alpha.1.24416.8 * Guess feed paths for dotnet10 * Update dependencies from https://github.com/dotnet/aspnetcore build 20240820.12 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 10.0.0-alpha.1.24416.8 -> To Version 9.0.0-rc.2.24420.12 Dependency coherency updates Microsoft.Bcl.TimeProvider,Microsoft.Extensions.Caching.Abstractions,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration.Binder,Microsoft.Extensions.Configuration.Json,Microsoft.Extensions.Configuration,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.Diagnostics,Microsoft.Extensions.Hosting,Microsoft.Extensions.Http,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging.Configuration,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging,Microsoft.Extensions.Options.ConfigurationExtensions,Microsoft.Extensions.Options,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,System.Collections.Immutable,System.Configuration.ConfigurationManager,System.Diagnostics.DiagnosticSource,System.Diagnostics.PerformanceCounter,System.IO.Hashing,System.IO.Pipelines,System.Security.Cryptography.Pkcs,System.Security.Cryptography.Xml,System.Text.Encodings.Web,System.Text.Json,System.Runtime.Caching From Version 9.0.0-rc.1.24412.13 -> To Version 9.0.0-rc.1.24419.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Andrew Casey --- NuGet.config | 8 +++ eng/Version.Details.xml | 156 ++++++++++++++++++++-------------------- eng/Versions.props | 78 ++++++++++---------- 3 files changed, 125 insertions(+), 117 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6c4634936ba..f91233ccab5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,8 @@ + + @@ -37,6 +39,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 349668188ca..d24b5577cda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,164 +1,164 @@ - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/runtime - 05abb765e2740d7182c56e142fbe44d76fafedf4 + 418c3b9e2753715fa017ace6b3f1f5ec4d4d6aae - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 - + https://github.com/dotnet/aspnetcore - 42af9fe6ddd7c3f9cde04ac003bf97509881873b + 36332c8183f0205ec098822545dbe65d17d93405 diff --git a/eng/Versions.props b/eng/Versions.props index 8bb5987b3ee..160ccb4e4c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,46 +28,46 @@ --> - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 - 9.0.0-rc.1.24412.13 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 + 9.0.0-rc.1.24419.2 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 - 9.0.0-rc.1.24414.4 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 - 9.0.0-rc.2.24420.12 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 + 9.0.0-rc.2.24422.3 $(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012;EXTEXP0013;EXTEXP0014;EXTEXP0015;EXTEXP0016;EXTEXP0017 + + $(NoWarn);EXTOBS0001; + $(NoWarn);NU5104 diff --git a/docs/list-of-diagnostics.md b/docs/list-of-diagnostics.md index f540a808699..45c468db518 100644 --- a/docs/list-of-diagnostics.md +++ b/docs/list-of-diagnostics.md @@ -41,6 +41,16 @@ if desired. | `EXTEXP0016` | Hosting integration testing experiments | | `EXTEXP0017` | Contextual options experiments | +# Obsoletions + +At some point in its lifecycle APIs become obsolete. If you use obsolete APIs, you will get one of the diagnostic shown below. + +You may continue using obsolete APIs in your application, but we advise exploring proposed alternatives which you will find in the obsoletion message. + +| Diagnostic ID | Description | +| :---------------- | :---------- | +| `EXTOBS0001` | This API is obsolete and will be removed in a future version. Consider using [Resource Monitoring observable instruments](https://learn.microsoft.com/dotnet/core/diagnostics/built-in-metrics-diagnostics#microsoftextensionsdiagnosticsresourcemonitoring). | + # LoggerMessage | Diagnostic ID | Description | diff --git a/eng/MSBuild/LegacySupport.props b/eng/MSBuild/LegacySupport.props index 11e7aa6c0f5..c96a83d34d6 100644 --- a/eng/MSBuild/LegacySupport.props +++ b/eng/MSBuild/LegacySupport.props @@ -50,4 +50,8 @@ + + + + diff --git a/src/LegacySupport/ObsoleteAttribute/ObsoleteAttribute.cs b/src/LegacySupport/ObsoleteAttribute/ObsoleteAttribute.cs new file mode 100644 index 00000000000..3f75ef56ba3 --- /dev/null +++ b/src/LegacySupport/ObsoleteAttribute/ObsoleteAttribute.cs @@ -0,0 +1,52 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#if !NET5_0_OR_GREATER + +using System.Diagnostics.CodeAnalysis; + +namespace System; + +/// +/// Marks program elements that are no longer in use. +/// +/// +/// Source code imported from +/// +/// ObsoleteAttribute.cs without any changes, all resulting warnings ignored accordingly. +/// +#pragma warning disable CA1019 // Define accessors for attribute arguments +#pragma warning disable S3996 // URI properties should not be strings +[ExcludeFromCodeCoverage] +[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | + AttributeTargets.Interface | AttributeTargets.Constructor | AttributeTargets.Method | + AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | + AttributeTargets.Delegate, + Inherited = false)] +internal sealed class ObsoleteAttribute : Attribute +{ + public ObsoleteAttribute() + { + } + + public ObsoleteAttribute(string? message) + { + Message = message; + } + + public ObsoleteAttribute(string? message, bool error) + { + Message = message; + IsError = error; + } + + public string? Message { get; } + + public bool IsError { get; } + + public string? DiagnosticId { get; set; } + + public string? UrlFormat { get; set; } +} + +#endif diff --git a/src/LegacySupport/ObsoleteAttribute/README.md b/src/LegacySupport/ObsoleteAttribute/README.md new file mode 100644 index 00000000000..f667dfcf1e7 --- /dev/null +++ b/src/LegacySupport/ObsoleteAttribute/README.md @@ -0,0 +1,7 @@ +To use this source in your project, add the following to your `.csproj` file: + +```xml + + true + +``` diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceMonitorBuilder.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceMonitorBuilder.cs index 4890ea1bd1a..d2f6800d4f5 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceMonitorBuilder.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceMonitorBuilder.cs @@ -1,8 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Shared.DiagnosticIds; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring; @@ -21,6 +23,12 @@ public interface IResourceMonitorBuilder /// /// The publisher's implementation type. /// The value of the object instance. +#if !NET5_0_OR_GREATER +#pragma warning disable CS0436 // Type conflicts with imported type +#endif + [Obsolete(DiagnosticIds.Obsoletions.IResourceUtilizationPublisherMessage, + DiagnosticId = DiagnosticIds.Obsoletions.IResourceUtilizationPublisherDiagId, + UrlFormat = DiagnosticIds.UrlFormat)] IResourceMonitorBuilder AddPublisher<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>() where T : class, IResourceUtilizationPublisher; } diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceUtilizationPublisher.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceUtilizationPublisher.cs index 5476fcdad05..152d5fdb973 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceUtilizationPublisher.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/IResourceUtilizationPublisher.cs @@ -1,14 +1,22 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Threading; using System.Threading.Tasks; +using Microsoft.Shared.DiagnosticIds; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring; /// /// Defines the contract for a resource utilization publisher that gets invoked whenever resource utilization is computed. /// +#if !NET5_0_OR_GREATER +#pragma warning disable CS0436 // Type conflicts with imported type +#endif +[Obsolete(DiagnosticIds.Obsoletions.IResourceUtilizationPublisherMessage, + DiagnosticId = DiagnosticIds.Obsoletions.IResourceUtilizationPublisherDiagId, + UrlFormat = DiagnosticIds.UrlFormat)] public interface IResourceUtilizationPublisher { /// diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj index beffa2e9ac8..c71fddc3a5c 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj @@ -12,6 +12,7 @@ true true true + true true true diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitorBuilder.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitorBuilder.cs index 4f9f5c9284f..acd947c982b 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitorBuilder.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitorBuilder.cs @@ -1,10 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Diagnostics.CodeAnalysis; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; +using Microsoft.Shared.DiagnosticIds; namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring; @@ -21,6 +23,12 @@ public ResourceMonitorBuilder(IServiceCollection services) Services = services; } +#if !NET5_0_OR_GREATER +#pragma warning disable CS0436 // Type conflicts with imported type +#endif + [Obsolete(DiagnosticIds.Obsoletions.IResourceUtilizationPublisherMessage, + DiagnosticId = DiagnosticIds.Obsoletions.IResourceUtilizationPublisherDiagId, + UrlFormat = DiagnosticIds.UrlFormat)] public IResourceMonitorBuilder AddPublisher<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>() where T : class, IResourceUtilizationPublisher { diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs index aa3fd012029..d1f1385f20c 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceUtilizationInstruments.cs @@ -8,9 +8,6 @@ namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring; /// /// Represents the names of instruments published by this package. /// -/// -/// These metrics are currently only published on Linux. -/// /// internal static class ResourceUtilizationInstruments { diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Log.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Log.cs index 9be79e1851b..78c19524f75 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Log.cs +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Log.cs @@ -6,7 +6,6 @@ namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows; #pragma warning disable S109 -#pragma warning disable IDE0060 // Remove unused parameters - Reason: used by source generator. internal static partial class Log { diff --git a/src/Shared/DiagnosticIds/DiagnosticIds.cs b/src/Shared/DiagnosticIds/DiagnosticIds.cs index 343093e6f44..ce3b2ca9d18 100644 --- a/src/Shared/DiagnosticIds/DiagnosticIds.cs +++ b/src/Shared/DiagnosticIds/DiagnosticIds.cs @@ -117,6 +117,12 @@ internal static class AuditReports internal const string AUDREPGEN000 = nameof(AUDREPGEN000); internal const string AUDREPGEN001 = nameof(AUDREPGEN001); } + + internal static class Obsoletions + { + internal const string IResourceUtilizationPublisherDiagId = "EXTOBS0001"; + internal const string IResourceUtilizationPublisherMessage = "This API is obsolete and will be removed in a future version. Consider using Resource Monitoring observable instruments."; + } } #pragma warning restore S1144 diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Publishers/EmptyPublisher.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Publishers/EmptyPublisher.cs index 85c03212ee6..74af8d013a9 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Publishers/EmptyPublisher.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/Publishers/EmptyPublisher.cs @@ -7,7 +7,7 @@ namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Test.Publishers; /// -/// A publisher that do nothing. +/// A publisher that does nothing. /// internal sealed class EmptyPublisher : IResourceUtilizationPublisher { diff --git a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs index 86d4f5d351d..d223db1651d 100644 --- a/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs +++ b/test/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring.Tests/ResourceMonitoringServiceTests.cs @@ -34,7 +34,7 @@ public sealed class ResourceMonitoringServiceTests /// /// Simply construct the object. /// - /// Tests that look into internals like this are evil. Consider removing long term. + /// Tests that look into internals like this are evil. Consider removing long term. [Fact] public void BasicConstructor() { @@ -77,7 +77,7 @@ public void BasicConstructor_NullOptions_Throws() /// /// Simply construct the object (publisher constructor). /// - /// Tests that look into internals like this are evil. Consider removing long term. + /// Tests that look into internals like this are evil. Consider removing long term. [Fact] public void BasicConstructor_NullPublishers_Throws() { @@ -295,7 +295,7 @@ public async Task RunTrackerAsync_IfPublisherThrows_LogsError() /// /// Validate that the tracker invokes the publisher's Publish method. /// - /// Tests that look into internals like this are evil. Consider removing long term. + /// Tests that look into internals like this are evil. Consider removing long term. [Fact] public async Task ResourceUtilizationTracker_InitializedProperly_InvokesPublishers() { diff --git a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/RequestMessageSnapshotTests.cs b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/RequestMessageSnapshotTests.cs index 4a5214f2a40..742822f73e7 100644 --- a/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/RequestMessageSnapshotTests.cs +++ b/test/Libraries/Microsoft.Extensions.Http.Resilience.Tests/Resilience/RequestMessageSnapshotTests.cs @@ -11,7 +11,6 @@ namespace Microsoft.Extensions.Http.Resilience.Test.Resilience; -#pragma warning disable CS0618 // Type or member is obsolete #pragma warning disable CS0618 // Type or member is obsolete public class RequestMessageSnapshotTests