From b36b0f2bc839d3a5b28a92348fa439c577b4e14d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 22:18:37 -0800 Subject: [PATCH 1/6] [release/7.0-staging] Update dependencies from dotnet/runtime-assets (#97551) * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240125.2 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24060.3 -> To Version 7.0.0-beta.24075.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 ++-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8c974d5ecd320b..e7bcaf28a4c63f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,8 @@ - - - + + - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 - 7.0.0-beta.24060.3 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 + 7.0.0-beta.24075.2 1.0.0-prerelease.22415.6 1.0.0-prerelease.22415.6 From f5c7a6fb91e5a5ebac94a642c10ee47a485c68a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 14:45:16 -0800 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/emsdk build 20240208.2 (#98173) Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.16 -> To Version 7.0.17 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 +--- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e7bcaf28a4c63f..57ae1958be57de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,9 +9,7 @@ - - - + From 46413388c0c174ac3f232b0e9b20e1cf4d291d18 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Thu, 8 Feb 2024 23:13:34 -0800 Subject: [PATCH 3/6] Update SqlClient and ship M.W.C (#97883) --- eng/Versions.props | 2 +- .../src/Microsoft.Windows.Compatibility.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 806314f5be1ca8..197cd0c5d640a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -94,7 +94,7 @@ 4.5.1 6.0.0 5.0.0 - 4.8.5 + 4.8.6 4.5.0 5.0.0 5.0.0 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 ccb1a7364cdc6b..b0e26d14e1462c 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 - 5 + true + 6 $(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 as well as .NET Standard. From 828f413587c7013bf94b2956b278a8f9bb6850c5 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Sun, 11 Feb 2024 15:59:26 -0800 Subject: [PATCH 4/6] Define installer-owned directories in dotnet-runtime RPM package (#98244) --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 368726644a6385..e67601e3423ed7 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -53,6 +53,7 @@ + From fec5731d2c3e8da7aa0498c999eb62ed123e43dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 10:04:22 -0800 Subject: [PATCH 5/6] [release/7.0-staging] Update dependencies from dotnet/runtime-assets (#98223) * Update dependencies from https://github.com/dotnet/runtime-assets build 20240208.3 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24075.2 -> To Version 7.0.0-beta.24108.3 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240208.3 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24075.2 -> To Version 7.0.0-beta.24108.3 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240208.3 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24075.2 -> To Version 7.0.0-beta.24108.3 * Update dependencies from https://github.com/dotnet/runtime-assets build 20240208.3 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 7.0.0-beta.24075.2 -> To Version 7.0.0-beta.24108.3 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75945529e333cf..683eef01a0c542 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,57 +130,57 @@ https://github.com/dotnet/arcade 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d https://github.com/dotnet/llvm-project @@ -282,9 +282,9 @@ https://github.com/dotnet/hotreload-utils 74472cc407fe757b9479fd78cdb64d7d6e67935f - + https://github.com/dotnet/runtime-assets - 03aa8c38ab8dbcea7c22fb6d73c8d919312f9379 + f93bf7065dcb41b86d440a5f1b62f27ef3216d9d https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 197cd0c5d640a4..ab3145e2330a8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,20 +118,20 @@ 4.5.0 7.0.0-rc.1.22414.6 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 - 7.0.0-beta.24075.2 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 + 7.0.0-beta.24108.3 1.0.0-prerelease.22415.6 1.0.0-prerelease.22415.6 From e8966af28370f5b0ea1c16a19481f85e05573f5c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 12:16:06 -0800 Subject: [PATCH 6/6] Add ca-certificates to Mariner 2.0 deps (#98268) Co-authored-by: Nikola Milosavljevic --- .../dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj index 52b410239d3be7..76315c4255ec16 100644 --- a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-cm.2.proj @@ -5,6 +5,6 @@ - +