Skip to content

Commit

Permalink
Merge in 'release/6.0' changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-bot committed Apr 16, 2024
2 parents 7dd5777 + 673b083 commit 97d8f4c
Show file tree
Hide file tree
Showing 61 changed files with 1,440 additions and 1,964 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.24154.4",
"version": "6.0.0-prerelease.24208.3",
"commands": [
"xharness"
]
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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-5a6205a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3b28b2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
2 changes: 1 addition & 1 deletion THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ https://github.com/madler/zlib
https://zlib.net/zlib_license.html

/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.2.13, October 13th, 2022
version 1.3.1, January 22nd, 2024

Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler

Expand Down
152 changes: 76 additions & 76 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,150 +1,150 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24114.3">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24211.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>b62077d90972117ad4663128962914864b19ad05</Sha>
<Sha>f2734cffa9b7f1270de7cc701e76b9a8eb938a19</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.29">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.30">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.29">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.30">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.29">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.30">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
<Sha>3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>04c3656e0325277aefa18378f24238d39b259222</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24163.13">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</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.24124.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24124.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</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.24154.4">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24208.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24154.4">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24208.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e3f823d9e7dd5b42dde2fc3cdc1fb3650dd197f2</Sha>
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24163.13">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24204.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
<Sha>bd9b4590681e602535ed414e98a17e6ba121dca4</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.24115.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24211.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>0d7d008228ffdfeb200fdf8039419a7c019eff50</Sha>
<Sha>b11d2b601cd75038e3f587650f75286f0a0b6902</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24124.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24211.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>883c47a740b678482efd9dfee6da38ac108fbca9</Sha>
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</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 97d8f4c

Please sign in to comment.