From 313497f16af57c533dffabdf7bff694c29a7d81a Mon Sep 17 00:00:00 2001 From: Aman Khalid Date: Mon, 30 Sep 2024 17:54:05 +0000 Subject: [PATCH 1/8] [release/6.0-staging] Revert `Linux_arm` images to `ubuntu-16.04` (#108396) --- eng/pipelines/common/templates/pipeline-with-resources.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/templates/pipeline-with-resources.yml b/eng/pipelines/common/templates/pipeline-with-resources.yml index 93d2f29bb35aee..2a70349a924fa2 100644 --- a/eng/pipelines/common/templates/pipeline-with-resources.yml +++ b/eng/pipelines/common/templates/pipeline-with-resources.yml @@ -17,7 +17,7 @@ extends: containers: Linux_arm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-20220907130538-70ed2e8 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be env: ROOTFS_DIR: /crossrootfs/arm @@ -35,7 +35,7 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-WithNode-20210910135845-c401c85 Linux_musl_arm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm-alpine-20220915134743-78f7860 + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9 env: ROOTFS_DIR: /crossrootfs/arm From 8b6500b1c5541a889a9e018aa149918a2c8bf57f Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Thu, 3 Oct 2024 15:26:37 -0700 Subject: [PATCH 2/8] Update RedHat 7 -> 8 -- release/6.0-staging (#105063) * Update RedHat version * Replace RHEL7 with CentOS Stream 9 * Update runtime queues --- eng/pipelines/coreclr/templates/helix-queues-setup.yml | 6 +++--- eng/pipelines/libraries/helix-queues-setup.yml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 8130fabfda83d8..7ce238cf905f10 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -49,7 +49,7 @@ jobs: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Debian.12.Arm32)Ubuntu.2204.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-arm32v7 - (Debian.11.Arm32)Ubuntu.2204.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-arm32v7 - - (Ubuntu.2004.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 + - (Ubuntu.1804.Arm32)Ubuntu.1804.Armarch@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7 # Linux arm64 - ${{ if eq(parameters.platform, 'Linux_arm64') }}: @@ -92,13 +92,13 @@ jobs: - (Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - Ubuntu.2004.Amd64.Open - - RedHat.7.Amd64.Open + - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Debian.12.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 - (Debian.11.Amd64)Ubuntu.2204.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - Ubuntu.2004.Amd64 - (Fedora.39.Amd64)Ubuntu.2204.amd64.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39-helix - - RedHat.7.Amd64 + - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix # OSX arm64 - ${{ if eq(parameters.platform, 'OSX_arm64') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index a2d8b893c7f46a..9c8f82417fee3e 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -54,7 +54,7 @@ jobs: - ${{ if eq(parameters.platform, 'Linux_x64') }}: - ${{ if and(eq(parameters.jobParameters.interpreter, ''), ne(parameters.jobParameters.isSingleFile, true)) }}: - ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - - RedHat.7.Amd64.Open + - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - SLES.15.Amd64.Open - (Fedora.39.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39-helix - ubuntu.2204.amd64.open.svc @@ -62,7 +62,7 @@ jobs: - ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}: - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}: - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - - RedHat.7.Amd64.Open + - (Centos.9.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-helix - Ubuntu.2004.Amd64.Open - SLES.12.Amd64.Open - SLES.15.Amd64.Open @@ -71,8 +71,7 @@ jobs: - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - (Mariner.2.0.Amd64.Open)ubuntu.2204.amd64.open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}: - - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-helix - - RedHat.7.Amd64.Open + - (Centos.7.Amd64.Open)Ubuntu.2204.Amd64.Open.svc@mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-mlnet-helix - (Debian.11.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64 - Ubuntu.2004.Amd64.Open - ${{ if or(eq(parameters.jobParameters.interpreter, 'true'), eq(parameters.jobParameters.isSingleFile, true)) }}: From b6afae1910497381e33d9aa73cc8479f71b71dd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:32:29 -0600 Subject: [PATCH 3/8] [release/6.0-staging] Update dependencies from dotnet/xharness (#107756) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/xharness build 20240820.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.24224.2 -> To Version 6.0.0-prerelease.24420.2 * Update dependencies from https://github.com/dotnet/xharness build 20240917.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 6.0.0-prerelease.24420.2 -> To Version 6.0.0-prerelease.24467.2 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- .config/dotnet-tools.json | 2 +- NuGet.config | 9 +++------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ec9168a7cffca9..ad5b54070d87e0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "6.0.0-prerelease.24224.2", + "version": "6.0.0-prerelease.24467.2", "commands": [ "xharness" ] diff --git a/NuGet.config b/NuGet.config index 03c30ea365e4ad..67926a368794de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,10 @@ - - - - - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ef3160a748369..c60d5b3c0f78d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,13 +214,13 @@ https://github.com/mono/linker c8499798a2a09639174e2f5c694d6652794cc73d - + https://github.com/dotnet/xharness - d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1 + c77d400d1c31f721ad585970c4ba8586e2f86b51 - + https://github.com/dotnet/xharness - d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1 + c77d400d1c31f721ad585970c4ba8586e2f86b51 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 04922f2b457ba2..6a07cf9a814648 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,8 +143,8 @@ 1.0.1-prerelease-00006 17.4.0-preview-20220707-01 - 6.0.0-prerelease.24224.2 - 6.0.0-prerelease.24224.2 + 6.0.0-prerelease.24467.2 + 6.0.0-prerelease.24467.2 6.0.0-alpha.0.24402.2 2.4.2-pre.9 2.4.2 From ff951975197a1d3312b406a3dca168ccc92226b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:34:38 -0600 Subject: [PATCH 4/8] [release/6.0-staging] Update dependencies from dotnet/icu (#107764) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/icu build 20240912.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.24315.1 -> To Version 6.0.0-rtm.24462.2 * Update dependencies from https://github.com/dotnet/icu build 20241010.4 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.24462.2 -> To Version 6.0.0-rtm.24510.4 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c60d5b3c0f78d0..c7cb03d7ce9803 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 20d255e341e98186edf70b24aa52fdd81797cc51 + c19fc3e62ccdc92489c82d7aad8d58eca86ce166 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 6a07cf9a814648..76eb02c7433982 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ 6.0.100-1.21459.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rtm.24315.1 + 6.0.0-rtm.24510.4 6.0.0-servicing.22205.1 From d73158c15e770143a9afd1c86e55df8cbfc75550 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:36:53 -0600 Subject: [PATCH 5/8] [release/6.0-staging] Update dependencies from dotnet/hotreload-utils (#107826) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/hotreload-utils build 20240914.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 6.0.0-alpha.0.24402.2 -> To Version 6.0.0-alpha.0.24464.1 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20241011.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 6.0.0-alpha.0.24464.1 -> To Version 6.0.0-alpha.0.24511.1 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7cb03d7ce9803..46b2389524c03e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -242,9 +242,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d50065944d8b41d804448a7056351481d583ad3d - + https://github.com/dotnet/hotreload-utils - 036e630c228a06e61db385ecbe2b96ad995b0f61 + 862404d0de2399be339effabad912c7f6027fc20 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 76eb02c7433982..925783b3b0f038 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,7 +145,7 @@ 17.4.0-preview-20220707-01 6.0.0-prerelease.24467.2 6.0.0-prerelease.24467.2 - 6.0.0-alpha.0.24402.2 + 6.0.0-alpha.0.24511.1 2.4.2-pre.9 2.4.2 1.3.0 From ba809293f4885ffcbe6208d72301d761ed415ef8 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 14 Oct 2024 16:46:07 -0700 Subject: [PATCH 6/8] [release/6.0] Reduce net core app current package dependencies, increase direct update availability (#108797) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Avoid package dependencies on libraries in the shared framework We can avoid these dependencies since we can count on the library being part of the shared framework. Fewer dependencies means less packages downloaded, less for customers to service, less copied into the output directory when serviced. Backport of 6e440de5b435aee32673376773c58652d1474f49 * Enable packages for every project that reduced dependencies * Add an option to enable servicing for transitive dependencies * Permit settting ServiceTransitiveDependencies in projects as well * Add additional packages required for up-stack servicing * Fix indenting Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> * Bump servicing version for packages that shipped last month --------- Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- docs/coding-guidelines/libraries-packaging.md | 8 +++ docs/project/library-servicing.md | 4 ++ eng/packaging.targets | 59 +++++++++++++++++-- ...oft.Extensions.Caching.Abstractions.csproj | 2 + ...Microsoft.Extensions.Caching.Memory.csproj | 2 +- ...tensions.Configuration.Abstractions.csproj | 2 + ...oft.Extensions.Configuration.Binder.csproj | 2 + ...xtensions.Configuration.CommandLine.csproj | 2 + ....Configuration.EnvironmentVariables.csproj | 3 +- ...nsions.Configuration.FileExtensions.csproj | 2 + ...rosoft.Extensions.Configuration.Ini.csproj | 2 + ...osoft.Extensions.Configuration.Json.csproj | 7 ++- ...xtensions.Configuration.UserSecrets.csproj | 3 +- ...rosoft.Extensions.Configuration.Xml.csproj | 2 + .../Microsoft.Extensions.Configuration.csproj | 3 +- ...soft.Extensions.DependencyInjection.csproj | 6 +- ...icrosoft.Extensions.DependencyModel.csproj | 15 +++-- ...tensions.FileProviders.Abstractions.csproj | 2 + ....Extensions.FileProviders.Composite.csproj | 2 + ...t.Extensions.FileProviders.Physical.csproj | 2 + ...oft.Extensions.Hosting.Abstractions.csproj | 2 + ...icrosoft.Extensions.Hosting.Systemd.csproj | 2 + ....Extensions.Hosting.WindowsServices.csproj | 4 +- .../src/Microsoft.Extensions.Hosting.csproj | 2 + .../src/Microsoft.Extensions.Http.csproj | 2 + ...ft.Extensions.Logging.Configuration.csproj | 2 + ...icrosoft.Extensions.Logging.Console.csproj | 9 ++- .../Microsoft.Extensions.Logging.Debug.csproj | 2 + ...crosoft.Extensions.Logging.EventLog.csproj | 2 + ...soft.Extensions.Logging.EventSource.csproj | 7 ++- ...soft.Extensions.Logging.TraceSource.csproj | 2 + .../src/Microsoft.Extensions.Logging.csproj | 2 + ...ons.Options.ConfigurationExtensions.csproj | 2 + ....Extensions.Options.DataAnnotations.csproj | 2 + .../src/Microsoft.Extensions.Options.csproj | 2 + .../Microsoft.Extensions.Primitives.csproj | 4 +- ...rosoft.Win32.Registry.AccessControl.csproj | 9 +-- .../Microsoft.Windows.Compatibility.csproj | 8 +-- .../src/System.Collections.Immutable.csproj | 5 +- ....Configuration.ConfigurationManager.csproj | 4 +- .../src/System.Data.Odbc.csproj | 7 ++- .../src/System.Data.OleDb.csproj | 4 +- ...System.Diagnostics.DiagnosticSource.csproj | 7 ++- ...stem.Diagnostics.PerformanceCounter.csproj | 4 +- ...DirectoryServices.AccountManagement.csproj | 7 ++- .../src/System.DirectoryServices.csproj | 7 ++- .../src/System.IO.Packaging.csproj | 2 +- .../src/System.Memory.Data.csproj | 7 ++- .../src/System.Net.Http.Json.csproj | 10 +++- .../src/System.Reflection.Metadata.csproj | 7 ++- ...stem.Reflection.MetadataLoadContext.csproj | 9 ++- .../src/System.Runtime.Caching.csproj | 4 +- .../System.Security.Cryptography.Pkcs.csproj | 7 ++- .../System.Security.Cryptography.Xml.csproj | 7 ++- .../src/System.Security.Permissions.csproj | 7 ++- .../src/System.Text.Encoding.CodePages.csproj | 7 ++- .../src/System.Text.Encodings.Web.csproj | 5 +- .../src/System.Text.Json.csproj | 6 +- .../src/System.Threading.AccessControl.csproj | 7 ++- 59 files changed, 245 insertions(+), 80 deletions(-) diff --git a/docs/coding-guidelines/libraries-packaging.md b/docs/coding-guidelines/libraries-packaging.md index 8e2b4db7e84e66..96c893db7c45ca 100644 --- a/docs/coding-guidelines/libraries-packaging.md +++ b/docs/coding-guidelines/libraries-packaging.md @@ -18,6 +18,14 @@ Source generators and analyzers can be included in the shared framework by speci Removing a library from the shared framework is a breaking change and should be avoided. +### References to libraries in the shared framework that produce packages + +It's beneficial to avoid project references to libraries that are in the shared framework because it makes the package graph smaller which reduces the number of packages that require servicing and the number of libraries that end up being copied into the application directory. + +If a dependency is part of the shared framework a project/package reference is never required on the latest version (`NetCoreAppCurrent`). A reference is required for previous .NET versions even if the dependency is part of the shared framework if the project you are building targets .NETStandard and references the project there. You may completely avoid a package dependency on .NETStandard and .NET if it's not needed for .NETStandard (for example - if it is an implementation only dependency and you're building a PNSE assembly for .NETStandard). + +Warning NETPKG0001 is emitted when you have an unnecessary reference to a library that is part of the shared framework. To avoid this warning, make sure your ProjectReference is conditioned so that it doesn't apply on `NetCoreAppCurrent`. + ## Transport package Transport packages are non-shipping packages that dotnet/runtime produces in order to share binaries with other repositories. diff --git a/docs/project/library-servicing.md b/docs/project/library-servicing.md index a9431903fc7024..d4531bbd9974ec 100644 --- a/docs/project/library-servicing.md +++ b/docs/project/library-servicing.md @@ -17,6 +17,10 @@ Additionally, if the library is listed among the project references of [Microsof When you make a change to a library & ship it during the servicing release, the `ServicingVersion` must be bumped. This property is found in the library's source project. It's also possible that the property is not in that file, in which case you'll need to add it to the library's source project and set it to 1. If the property is already present in your library's source project, just increment the servicing version by 1. +## Optionally ensure all up-stack packages are also produced + +If you wish to ensure that every package that references a serviced package is also serviced itself, you can enable validation by setting `ServiceTransitiveDependencies` to true. This can be done in an individual project, or globally. When doing this then building the repo, eg: `build libs -allConfigurations` you'll see errors from any project that didn't enable servicing. Reasons for forcing packages which depend on your package to service are security servicing or removing dependencies. + ## Test your changes All that's left is to ensure that your changes have worked as expected. To do so, execute the following steps: diff --git a/eng/packaging.targets b/eng/packaging.targets index 77f0805b438f01..012245b47f54c9 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -183,6 +183,21 @@ + + + + + @@ -285,10 +300,46 @@ - - + + + + $(GeneratePackageOnBuild) + + + + + + + <_TransitiveServicedPackages + Condition="'%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' and + '%(ReferencePath.GeneratePackageOnBuild)' == 'true'" + >@(ReferencePath->'%(OriginalProjectReferenceItemSpec)') + + + + + + + + + + + + + + + diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj index b5279da71f651a..78bdee1e837b1c 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/src/Microsoft.Extensions.Caching.Abstractions.csproj @@ -8,6 +8,8 @@ Commonly Used Types: Microsoft.Extensions.Caching.Distributed.IDistributedCache Microsoft.Extensions.Caching.Memory.IMemoryCache + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj index d7a09ae1d5a9b1..a6aaf738484f36 100644 --- a/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj +++ b/src/libraries/Microsoft.Extensions.Caching.Memory/src/Microsoft.Extensions.Caching.Memory.csproj @@ -5,7 +5,7 @@ true In-memory cache implementation of Microsoft.Extensions.Caching.Memory.IMemoryCache. true - 2 + 3 true diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj index 24cbc9380f00fc..7bf98dc941e433 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -11,6 +11,8 @@ Microsoft.Extensions.Configuration.IConfigurationBuilder Microsoft.Extensions.Configuration.IConfigurationProvider Microsoft.Extensions.Configuration.IConfigurationRoot Microsoft.Extensions.Configuration.IConfigurationSection + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj index ec4d33e23eeeef..e4f2d73170f4fa 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/src/Microsoft.Extensions.Configuration.Binder.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj index e86f2b36065ffd..43b09edeaad624 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/src/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Command line configuration provider implementation for Microsoft.Extensions.Configuration. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj index 8983f7795cb97f..db55ada52d247a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/src/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -4,7 +4,8 @@ netstandard2.0;net461 true Environment variables configuration provider implementation for Microsoft.Extensions.Configuration. - 1 + true + 2 diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj index 0c6a948a2acbd3..083f4dc803410a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/src/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj index 045743ef32bb4a..2123495e6ac33a 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/src/Microsoft.Extensions.Configuration.Ini.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true INI configuration provider implementation for Microsoft.Extensions.Configuration. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj index ba9b9995989eb7..b5075946e967eb 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Json/src/Microsoft.Extensions.Configuration.Json.csproj @@ -5,6 +5,8 @@ true true JSON configuration provider implementation for Microsoft.Extensions.Configuration. + true + 1 @@ -12,7 +14,6 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj index a029a8c863902f..ec6a665a2fff88 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -4,7 +4,8 @@ netstandard2.0;net461 true User secrets configuration provider implementation for Microsoft.Extensions.Configuration. - 1 + true + 2 diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj index 9a06f8e7ad52b3..51c1988cd36c03 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/src/Microsoft.Extensions.Configuration.Xml.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461-windows true XML configuration provider implementation for Microsoft.Extensions.Configuration. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj index e20863957c5223..59363b4a68b4b2 100644 --- a/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration/src/Microsoft.Extensions.Configuration.csproj @@ -4,7 +4,8 @@ netstandard2.0;net461 true Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider. - 1 + true + 2 diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj index 2f840f92672d6b..694ae976708cc3 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/src/Microsoft.Extensions.DependencyInjection.csproj @@ -10,7 +10,8 @@ Default implementation of dependency injection for Microsoft.Extensions.DependencyInjection. false - 1 + true + 2 @@ -50,6 +51,9 @@ + + + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj index 6fca8a4c7aec92..3aefacf28735a8 100644 --- a/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyModel/src/Microsoft.Extensions.DependencyModel.csproj @@ -2,12 +2,12 @@ netstandard2.0;net461 true - true - 1 Abstractions for reading `.deps` files. Commonly Used Types: Microsoft.Extensions.DependencyModel.DependencyContext + true + 2 @@ -18,7 +18,7 @@ Microsoft.Extensions.DependencyModel.DependencyContext - + @@ -26,12 +26,15 @@ Microsoft.Extensions.DependencyModel.DependencyContext - - - + + + + + + diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj index 07289f58670e5b..51c86a3c22e991 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/Microsoft.Extensions.FileProviders.Abstractions.csproj @@ -10,6 +10,8 @@ Commonly Used Types: Microsoft.Extensions.FileProviders.IDirectoryContents Microsoft.Extensions.FileProviders.IFileInfo Microsoft.Extensions.FileProviders.IFileProvider + true + 1 diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj index f692dd38aae885..7fa9c7e71a8d96 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/src/Microsoft.Extensions.FileProviders.Composite.csproj @@ -5,6 +5,8 @@ netstandard2.0;net461 true Composite file and directory providers for Microsoft.Extensions.FileProviders. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj index 242f042fb3262a..6f4b5a9416b3f0 100644 --- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj +++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/src/Microsoft.Extensions.FileProviders.Physical.csproj @@ -6,6 +6,8 @@ true true File provider for physical files for Microsoft.Extensions.FileProviders. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj index c1d22e36caf288..8478d668784b74 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/src/Microsoft.Extensions.Hosting.Abstractions.csproj @@ -5,6 +5,8 @@ Microsoft.Extensions.Hosting true Hosting and startup abstractions for applications. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj index b3d03b24a3444d..f0929344bdbf84 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/src/Microsoft.Extensions.Hosting.Systemd.csproj @@ -4,6 +4,8 @@ netstandard2.1 true .NET hosting infrastructure for Systemd Services. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj index 052c68ff8b2d99..54cd1f992d2c39 100644 --- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/src/Microsoft.Extensions.Hosting.WindowsServices.csproj @@ -4,8 +4,8 @@ net461;netstandard2.0;netstandard2.1 true .NET hosting infrastructure for Windows Services. - false - 2 + true + 3 diff --git a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj index 5962169ce1aea5..353ea35019d532 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj +++ b/src/libraries/Microsoft.Extensions.Hosting/src/Microsoft.Extensions.Hosting.csproj @@ -4,6 +4,8 @@ $(NetCoreAppCurrent);netstandard2.0;netstandard2.1;net461 true Hosting and startup infrastructures for applications. + true + 1 false diff --git a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj index d2206f7e9dae72..37ea70482e7298 100644 --- a/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj +++ b/src/libraries/Microsoft.Extensions.Http/src/Microsoft.Extensions.Http.csproj @@ -8,6 +8,8 @@ Commonly Used Types: System.Net.Http.IHttpClientFactory + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 976be509012be6..0b3629ae3d0883 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Configuration support for Microsoft.Extensions.Logging. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index 51e9eb48083b43..c24721cf6e5bc2 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -9,6 +9,8 @@ false true Console logger provider implementation for Microsoft.Extensions.Logging. + true + 1 @@ -35,7 +37,7 @@ - + @@ -47,6 +49,9 @@ + + + @@ -56,4 +61,4 @@ - \ No newline at end of file + diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj index 2c176051f1f2df..19ec92fab9f088 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Debug/src/Microsoft.Extensions.Logging.Debug.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Debug output logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a debugger monitor by writing messages with System.Diagnostics.Debug.WriteLine(). + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj index 04daa2e9d224d5..aa49e887cd0e41 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/src/Microsoft.Extensions.Logging.EventLog.csproj @@ -5,6 +5,8 @@ true true Windows Event Log logger provider implementation for Microsoft.Extensions.Logging. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index 8b0a16bb9db5c3..468e0f5f9e06ca 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -7,6 +7,8 @@ false EventSource/EventListener logger provider implementation for Microsoft.Extensions.Logging. + true + 1 @@ -28,7 +30,10 @@ - + + + + diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj index 7a0010c995814b..e5a29d9c775d6f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/src/Microsoft.Extensions.Logging.TraceSource.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true TraceSource logger provider implementation for Microsoft.Extensions.Logging. This logger logs messages to a trace listener by writing messages with System.Diagnostics.TraceSource.TraceEvent(). + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj index f06527607f1263..24d339ed1c1805 100644 --- a/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj +++ b/src/libraries/Microsoft.Extensions.Logging/src/Microsoft.Extensions.Logging.csproj @@ -6,6 +6,8 @@ false Logging infrastructure default implementation for Microsoft.Extensions.Logging. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj index 5d30bfa93e2bc4..a2002512f92ea6 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/src/Microsoft.Extensions.Options.ConfigurationExtensions.csproj @@ -4,6 +4,8 @@ netstandard2.0;net461 true Provides additional configuration specific functionality related to Options. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj index 149921ab06d4b6..41f3019c61e2ba 100644 --- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj +++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/src/Microsoft.Extensions.Options.DataAnnotations.csproj @@ -4,6 +4,8 @@ netstandard2.1;netstandard2.0;net461 true Provides additional DataAnnotations specific functionality related to Options. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj index 04dd8ce5f15001..df9a4bf08b4e84 100644 --- a/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj +++ b/src/libraries/Microsoft.Extensions.Options/src/Microsoft.Extensions.Options.csproj @@ -4,6 +4,8 @@ netstandard2.1;netstandard2.0;net461 true Provides a strongly typed way of specifying and accessing settings using dependency injection. + true + 1 diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 5f2911b00eccef..4774f553892eab 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -11,6 +11,8 @@ Commonly Used Types: Microsoft.Extensions.Primitives.IChangeToken Microsoft.Extensions.Primitives.StringValues Microsoft.Extensions.Primitives.StringSegment + true + 1 @@ -22,7 +24,7 @@ Microsoft.Extensions.Primitives.StringSegment - + diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj index 923e64056e39f5..8e6e398561aa5b 100644 --- a/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj +++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/src/Microsoft.Win32.Registry.AccessControl.csproj @@ -4,8 +4,8 @@ enable true - false - 0 + true + 1 Provides support for managing access and audit control lists for Microsoft.Win32.RegistryKey. Commonly Used Types: @@ -26,13 +26,14 @@ System.Security.AccessControl.RegistrySecurity - + + @@ -40,4 +41,4 @@ System.Security.AccessControl.RegistrySecurity - \ No newline at end of file + diff --git a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj index a86115b820874c..7b173051396eae 100644 --- a/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj +++ b/src/libraries/Microsoft.Windows.Compatibility/src/Microsoft.Windows.Compatibility.csproj @@ -5,8 +5,8 @@ false true - false - 8 + true + 9 $(NoWarn);NU5128 This Windows Compatibility Pack provides access to APIs that were previously available only for .NET Framework. It can be used from both .NET Core as well as .NET Standard. @@ -31,7 +31,6 @@ - @@ -39,7 +38,6 @@ - @@ -69,5 +67,7 @@ + + diff --git a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj index 9f95b79a7d3ab5..f8f5b20fc35f52 100644 --- a/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj +++ b/src/libraries/System.Collections.Immutable/src/System.Collections.Immutable.csproj @@ -3,6 +3,8 @@ $(NetCoreAppCurrent);netstandard2.0;net461 enable true + true + 1 This package provides collections that are thread safe and guaranteed to never change their contents, also known as immutable collections. Like strings, any methods that perform modifications will not change the existing instance but instead return a new instance. For efficiency reasons, the implementation uses a sharing mechanism to ensure that newly created instances share as much data as possible with the previous instance while ensuring that operations have a predictable time complexity. Commonly Used Types: @@ -104,7 +106,7 @@ System.Collections.Immutable.ImmutableStack<T> Link="Common\System\Runtime\Versioning\NonVersionableAttribute.cs" /> - + @@ -116,6 +118,7 @@ System.Collections.Immutable.ImmutableStack<T> + diff --git a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj index 3bbf8740e7c0b7..86cf0eab20db0c 100644 --- a/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj +++ b/src/libraries/System.Configuration.ConfigurationManager/src/System.Configuration.ConfigurationManager.csproj @@ -6,8 +6,8 @@ $(NoWarn);CA1847 true - false - 1 + true + 2 Provides types that support using configuration files. Commonly Used Types: diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj index 44d67a9ba137b0..e799ac33d85a25 100644 --- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj +++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj @@ -6,8 +6,8 @@ enable true - false - 1 + true + 2 Provides a collection of classes used to access an ODBC data source in the managed space Commonly Used Types: @@ -149,7 +149,7 @@ System.Data.Odbc.OdbcTransaction - + @@ -170,6 +170,7 @@ System.Data.Odbc.OdbcTransaction + diff --git a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj index 3370a6f9deed38..33d433a670b2bc 100644 --- a/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj +++ b/src/libraries/System.Data.OleDb/src/System.Data.OleDb.csproj @@ -12,8 +12,8 @@ $(NoWarn);CA1845 true - false - 0 + true + 1 Provides a collection of classes for OLEDB. Commonly Used Types: diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj index 6b7edb4fe62225..b49c9c13af06f3 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/src/System.Diagnostics.DiagnosticSource.csproj @@ -11,8 +11,8 @@ Commonly Used Types: System.Diagnostics.DiagnosticListener System.Diagnostics.DiagnosticSource - false - 1 + true + 2 @@ -109,7 +109,7 @@ System.Diagnostics.DiagnosticSource - + @@ -120,6 +120,7 @@ System.Diagnostics.DiagnosticSource + diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj index 150710e9b74f93..03fe557fa667cc 100644 --- a/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj +++ b/src/libraries/System.Diagnostics.PerformanceCounter/src/System.Diagnostics.PerformanceCounter.csproj @@ -5,8 +5,8 @@ $(NoWarn);CA1847 true - false - 1 + true + 2 Provides the System.Diagnostics.PerformanceCounter class, which allows access to Windows performance counters. Commonly Used Types: diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj index 907f821fc3b7cf..10efd8ed42182b 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/System.DirectoryServices.AccountManagement.csproj @@ -7,8 +7,8 @@ $(NoWarn);CA2249 true - false - 0 + true + 1 true true Provides uniform access and manipulation of user, computer, and group security principals across the multiple principal stores: Active Directory Domain Services (AD DS), Active Directory Lightweight Directory Services (AD LDS), and Machine SAM (MSAM). @@ -103,7 +103,7 @@ - + @@ -118,6 +118,7 @@ + diff --git a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj index d11b153aaf7f42..e2afcf5d6f29e8 100644 --- a/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj +++ b/src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj @@ -6,8 +6,8 @@ enable true - false - 1 + true + 2 true true Provides easy access to Active Directory Domain Services. @@ -159,10 +159,10 @@ System.DirectoryServices.ActiveDirectory.DomainController - + @@ -186,6 +186,7 @@ System.DirectoryServices.ActiveDirectory.DomainController + diff --git a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj index 0936526a24dddd..5fb95bbf1b00d7 100644 --- a/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj +++ b/src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj @@ -8,7 +8,7 @@ true true - 1 + 2 Provides classes that support storage of multiple data objects in a single container. diff --git a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj index 8c5ac857a0bc1a..46458557dd2b7e 100644 --- a/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj +++ b/src/libraries/System.Memory.Data/src/System.Memory.Data.csproj @@ -4,8 +4,8 @@ true enable true - - 1.0.2 + true + 1 A lightweight abstraction for a payload of bytes. Provides methods for converting between strings, streams, JSON, and bytes. Commonly Used Types: @@ -24,13 +24,14 @@ System.BinaryData - + + diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index 2c68126bad5e09..a70b27145ac33c 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -3,8 +3,8 @@ $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 enable true - false - 1 + true + 2 Provides extension methods for System.Net.Http.HttpClient and System.Net.Http.HttpContent that perform automatic serialization and deserialization using System.Text.Json. Commonly Used Types: @@ -36,9 +36,11 @@ System.Net.Http.Json.JsonContent - + + + @@ -46,7 +48,9 @@ System.Net.Http.Json.JsonContent + + diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj index 340692c15f7b9b..df968bd14ec811 100644 --- a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj +++ b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj @@ -6,7 +6,8 @@ $(NetCoreAppCurrent);netstandard2.0;net461 enable true - 1 + true + 2 This packages provides a low-level .NET (ECMA-335) metadata reader and writer. It's geared for performance and is the ideal choice for building higher-level libraries that intend to provide their own object model, such as compilers. Commonly Used Types: @@ -256,11 +257,13 @@ System.Reflection.PortableExecutable.ManagedPEBuilder - + + + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 1c7ce45ad8cbb1..b6243a607fd939 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -6,6 +6,8 @@ $(NetCoreAppCurrent);netcoreapp3.1;netstandard2.0;net461 enable true + true + 1 Provides read-only reflection on assemblies in an isolated context with support for assemblies that have different architectures and runtimes. Commonly Used Types: @@ -151,20 +153,23 @@ System.Reflection.MetadataAssemblyResolver - - + + + + + diff --git a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj index 3f8f859c4f45d9..ef2dd3aa7ed4ab 100644 --- a/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj +++ b/src/libraries/System.Runtime.Caching/src/System.Runtime.Caching.csproj @@ -4,8 +4,8 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.0-windows;netstandard2.0 true - false - 0 + true + 1 true true true diff --git a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj index 3bb3f45e43cd3d..ffe15d0bcfa04d 100644 --- a/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj +++ b/src/libraries/System.Security.Cryptography.Pkcs/src/System.Security.Cryptography.Pkcs.csproj @@ -7,8 +7,8 @@ $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent);netcoreapp3.1-windows;netcoreapp3.1;netstandard2.1-windows;netstandard2.1;netstandard2.0-windows;netstandard2.0;net461-windows true - false - 4 + true + 5 Provides support for PKCS and CMS algorithms. Commonly Used Types: @@ -648,7 +648,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms - + @@ -668,6 +668,7 @@ System.Security.Cryptography.Pkcs.EnvelopedCms + diff --git a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj index 82c9d7a307cc8f..6dbbacec43c4a2 100644 --- a/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj +++ b/src/libraries/System.Security.Cryptography.Xml/src/System.Security.Cryptography.Xml.csproj @@ -4,8 +4,8 @@ $(NetCoreAppCurrent);netstandard2.0;net461-windows true - false - 1 + true + 2 Provides classes to support the creation and validation of XML digital signatures. The classes in this namespace implement the World Wide Web Consortium Recommendation, "XML-Signature Syntax and Processing", described at http://www.w3.org/TR/xmldsig-core/. Commonly Used Types: @@ -134,7 +134,7 @@ System.Security.Cryptography.Xml.XmlLicenseTransform - + @@ -147,6 +147,7 @@ System.Security.Cryptography.Xml.XmlLicenseTransform + diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index 852a69c96d2aae..24e75db80f244a 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -4,8 +4,8 @@ $(NetCoreAppCurrent);net5.0;netcoreapp3.1;netstandard2.0;net461-windows true - false - 0 + true + 1 Provides types supporting Code Access Security (CAS). @@ -192,7 +192,7 @@ - + @@ -205,6 +205,7 @@ + diff --git a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj index 28ed126161f263..a16dcd2b00a988 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/System.Text.Encoding.CodePages.csproj @@ -6,8 +6,8 @@ true true - false - 0 + true + 1 true Provides support for code-page based encodings, including Windows-1252, Shift-JIS, and GB2312. @@ -74,7 +74,7 @@ System.Text.CodePagesEncodingProvider - + @@ -84,6 +84,7 @@ System.Text.CodePagesEncodingProvider + diff --git a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj index 543b5929716594..9ca34d180f6531 100644 --- a/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj +++ b/src/libraries/System.Text.Encodings.Web/src/System.Text.Encodings.Web.csproj @@ -8,6 +8,8 @@ $(NoWarn);CS3011;CS3019 $(DefineConstants);TARGET_BROWSER true + true + 1 Provides types for encoding and escaping strings for use in JavaScript, HyperText Markup Language (HTML), and uniform resource locators (URL). Commonly Used Types: @@ -54,13 +56,14 @@ System.Text.Encodings.Web.JavaScriptEncoder - + + diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index c3bb2b0b586bee..24bb2ec8355a74 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -10,7 +10,7 @@ true true true - 10 + 11 Provides high-performance and low-allocating types that serialize objects to JavaScript Object Notation (JSON) text and deserialize JSON text to objects, with UTF-8 support built-in. Also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM), that is read-only, for random access of the JSON elements within a structured view of the data. Commonly Used Types: @@ -322,7 +322,7 @@ System.Text.Json.Utf8JsonReader - + @@ -339,9 +339,11 @@ System.Text.Json.Utf8JsonReader + + diff --git a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj index eef07db09ff2aa..b0119a21f0694a 100644 --- a/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj +++ b/src/libraries/System.Threading.AccessControl/src/System.Threading.AccessControl.csproj @@ -5,8 +5,8 @@ enable true - false - 0 + true + 1 Provides support for managing access and audit control lists for synchronization primitives. Commonly Used Types: @@ -65,13 +65,14 @@ System.Security.AccessControl.SemaphoreSecurity - + + From f0ecf8f03bd1df8a02670a152dc1553d7886ae05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:42:46 -0600 Subject: [PATCH 7/8] [release/6.0-staging] Update dependencies from dotnet/runtime-assets (#107828) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/runtime-assets build 20240913.1 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.24362.1 -> To Version 6.0.0-beta.24463.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20241010.5 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24510.5 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++++----------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46b2389524c03e..17bbab26e3f455 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,49 +102,49 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 https://github.com/dotnet/llvm-project @@ -246,9 +246,9 @@ https://github.com/dotnet/hotreload-utils 862404d0de2399be339effabad912c7f6027fc20 - + https://github.com/dotnet/runtime-assets - cb15e730441643e6187521d46d19ee3cef732ca8 + 6a4f81213202fee94133c3e8173afc673107fa99 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 925783b3b0f038..b18cc043faad6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -108,18 +108,18 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 - 6.0.0-beta.24362.1 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 + 6.0.0-beta.24510.5 1.0.0-prerelease.21416.5 1.0.0-prerelease.21416.5 From 335f13a7565e8a045e51dffbc22d6158afbd5c6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:42:56 -0600 Subject: [PATCH 8/8] [release/6.0-staging] Update dependencies from dotnet/arcade (#108300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20240913.1 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24413.1 -> To Version 6.0.0-beta.24463.1 * Update dependencies from https://github.com/dotnet/arcade build 20241008.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24508.2 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 12 +++---- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17bbab26e3f455..a251458310e3f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -26,77 +26,77 @@ - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 https://github.com/microsoft/vstest @@ -222,9 +222,9 @@ https://github.com/dotnet/xharness c77d400d1c31f721ad585970c4ba8586e2f86b51 - + https://github.com/dotnet/arcade - c3f5fe044e7115fb66c79db5e074cb341dbe21dd + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b18cc043faad6e..4614c15a0d2622 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,21 +42,21 @@ 1.1.0-preview.22164.17 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 2.5.1-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 - 6.0.0-beta.24413.1 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 2.5.1-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 + 6.0.0-beta.24508.2 6.0.0-preview.1.102 diff --git a/global.json b/global.json index dacfa41449b853..92581236cedb78 100644 --- a/global.json +++ b/global.json @@ -1,21 +1,21 @@ { "sdk": { - "version": "6.0.133", + "version": "6.0.135", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "6.0.133" + "dotnet": "6.0.135" }, "native-tools": { "cmake": "3.16.4", "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24413.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24413.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24508.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"