Skip to content

Commit

Permalink
Merge pull request #108861 from carlossanlop/release/6.0-staging
Browse files Browse the repository at this point in the history
[manual] Merge release/6.0-staging into release/6.0
  • Loading branch information
carlossanlop authored Oct 15, 2024
2 parents 061c8b7 + 335f13a commit 4b4a745
Show file tree
Hide file tree
Showing 67 changed files with 364 additions and 203 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "6.0.0-prerelease.24224.2",
"version": "6.0.0-prerelease.24467.2",
"commands": [
"xharness"
]
Expand Down
9 changes: 3 additions & 6 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ec74ec8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ec74ec8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec74ec8f-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
8 changes: 8 additions & 0 deletions docs/coding-guidelines/libraries-packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions docs/project/library-servicing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
140 changes: 70 additions & 70 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24315.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24510.4">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>20d255e341e98186edf70b24aa52fdd81797cc51</Sha>
<Sha>c19fc3e62ccdc92489c82d7aad8d58eca86ce166</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
<Uri>https://github.com/dotnet/msquic</Uri>
Expand All @@ -26,125 +26,125 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24413.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24362.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -214,17 +214,17 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24224.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24467.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
<Sha>c77d400d1c31f721ad585970c4ba8586e2f86b51</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24224.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24467.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
<Sha>c77d400d1c31f721ad585970c4ba8586e2f86b51</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24413.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24508.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -242,13 +242,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24402.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24511.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>036e630c228a06e61db385ecbe2b96ad995b0f61</Sha>
<Sha>862404d0de2399be339effabad912c7f6027fc20</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24362.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24510.5">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>cb15e730441643e6187521d46d19ee3cef732ca8</Sha>
<Sha>6a4f81213202fee94133c3e8173afc673107fa99</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
Loading

0 comments on commit 4b4a745

Please sign in to comment.