From d9e1e9516f70ceff76ee3511cb642775679a0f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:19:40 -0800 Subject: [PATCH] Bump versions of maintenance-packages dependencies consumed in runtime (#108806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump dependency versions of packages that now ship out of maintenance-packages (preview) - Microsoft.Bcl.HashCode - System.Buffers - System.Memory - System.Threading.Tasks.Extensions - System.Runtime.CompilerServices.Unsafe * Workaround name conflict for MathF: See https://github.com/dotnet/roslyn/issues/71442 We refer to MathF from a comment which hits this bug problem in Roslyn where it thinks it's ambiguous because visibility is not considered when resolving cref's in doc comments. * Permit maintenance-packages prebuilts * Suppress CS0618 on site in System.Data.Common.Tests - 'Sql*' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. --------- Co-authored-by: Eric StJohn Co-authored-by: Viktor Hofer Co-authored-by: Alexander Köplinger --- eng/Versions.props | 13 ++++---- .../Data/Common/DbProviderFactoriesTests.cs | 30 +++++++++++++++++++ .../src/System.Numerics.Tensors.csproj | 4 ++- .../TensorPrimitives.Single.netstandard.cs | 3 ++ src/libraries/apicompat/ApiCompat.proj | 2 +- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6b64bc81e5742..944237c4bc5ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,16 +111,17 @@ 10.0.0-alpha.1.24565.3 6.0.0 - 1.1.1 + 6.0.0 5.0.0 1.2.0-beta.507 - 4.5.1 + 4.6.0 5.0.0 - 4.8.6 + 4.9.0 8.0.0 8.0.1 5.0.0 - 4.5.5 + 4.6.0 + 4.6.0 10.0.0-alpha.1.24565.3 10.0.0-alpha.1.24565.3 6.0.0 @@ -129,9 +130,9 @@ 5.0.0 7.0.0 10.0.0-alpha.1.24565.3 - 6.0.0 + 6.1.0 7.0.0 - 4.5.4 + 4.6.0 4.5.0 10.0.0-alpha.1.24565.3 diff --git a/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.cs b/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.cs index b758b3967c62e..a1dd97ebe0df8 100644 --- a/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.cs +++ b/src/libraries/System.Data.Common/tests/System/Data/Common/DbProviderFactoriesTests.cs @@ -41,50 +41,62 @@ public void GetFactoryNoRegistrationTest() public void GetFactoryWithInvariantNameTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); DbProviderFactory factory = DbProviderFactories.GetFactory("System.Data.SqlClient"); Assert.NotNull(factory); Assert.Equal(typeof(System.Data.SqlClient.SqlClientFactory), factory.GetType()); Assert.Equal(System.Data.SqlClient.SqlClientFactory.Instance, factory); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void GetFactoryWithDbConnectionTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' and 'SqlConnection' are obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); DbProviderFactory factory = DbProviderFactories.GetFactory(new System.Data.SqlClient.SqlConnection()); Assert.NotNull(factory); Assert.Equal(typeof(System.Data.SqlClient.SqlClientFactory), factory.GetType()); Assert.Equal(System.Data.SqlClient.SqlClientFactory.Instance, factory); +#pragma warning restore CS0618 // 'SqlClientFactory' and 'SqlConnection' are obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void GetFactoryWithDataRowTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=> DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void RegisterFactoryWithTypeNameTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory).AssemblyQualifiedName)); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void RegisterFactoryWithTypeTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void RegisterFactoryWithInstanceTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", System.Data.SqlClient.SqlClientFactory.Instance)); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] @@ -92,7 +104,9 @@ public void RegisterFactoryWithWrongTypeTest() { ClearRegisteredFactories(); Assert.Throws(() => DbProviderFactories.GetFactory("System.Data.SqlClient")); +#pragma warning disable CS0618 // 'SqlConnection' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. Assert.Throws(() => DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlConnection))); +#pragma warning restore CS0618 // 'SqlConnection' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] @@ -100,14 +114,18 @@ public void RegisterFactoryWithBadInvariantNameTest() { ClearRegisteredFactories(); Assert.Throws(() => DbProviderFactories.GetFactory("System.Data.SqlClient")); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. Assert.Throws(() => DbProviderFactories.RegisterFactory(string.Empty, typeof(System.Data.SqlClient.SqlClientFactory))); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void RegisterFactoryWithAssemblyQualifiedNameTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory).AssemblyQualifiedName)); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] @@ -118,7 +136,9 @@ public void RegisterFactoryWithWrongAssemblyQualifiedNameTest() DataTable providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(0, providerTable.Rows.Count); // register the connection type which is the wrong type. Registraton should succeed, as type registration/checking is deferred. +#pragma warning disable CS0618 // 'SqlConnection' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlConnection).AssemblyQualifiedName); +#pragma warning restore CS0618 // 'SqlConnection' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(1, providerTable.Rows.Count); // obtaining the factory will kick in the checks of the registered type name, which will cause exceptions. The checks were deferred till the GetFactory() call. @@ -130,7 +150,9 @@ public void RegisterFactoryWithWrongAssemblyQualifiedNameTest() public void UnregisterFactoryTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", System.Data.SqlClient.SqlClientFactory.Instance)); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. Assert.True(DbProviderFactories.UnregisterFactory("System.Data.SqlClient")); DataTable providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(0, providerTable.Rows.Count); @@ -141,18 +163,22 @@ public void TryGetFactoryTest() { ClearRegisteredFactories(); Assert.False(DbProviderFactories.TryGetFactory("System.Data.SqlClient", out DbProviderFactory f)); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(() => DbProviderFactories.RegisterFactory("System.Data.SqlClient", System.Data.SqlClient.SqlClientFactory.Instance)); Assert.True(DbProviderFactories.TryGetFactory("System.Data.SqlClient", out DbProviderFactory factory)); Assert.NotNull(factory); Assert.Equal(typeof(System.Data.SqlClient.SqlClientFactory), factory.GetType()); Assert.Equal(System.Data.SqlClient.SqlClientFactory.Instance, factory); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } [Fact] public void ReplaceFactoryWithRegisterFactoryWithTypeTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(()=>DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(TestProviderFactory)); DataTable providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(1, providerTable.Rows.Count); @@ -166,7 +192,9 @@ public void ReplaceFactoryWithRegisterFactoryWithTypeTest() public void GetProviderInvariantNamesTest() { ClearRegisteredFactories(); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. RegisterSqlClientAndTestRegistration(() => DbProviderFactories.RegisterFactory("System.Data.SqlClient", typeof(System.Data.SqlClient.SqlClientFactory))); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. DbProviderFactories.RegisterFactory("System.Data.Common.TestProvider", typeof(TestProviderFactory)); DataTable providerTable = DbProviderFactories.GetFactoryClasses(); Assert.Equal(2, providerTable.Rows.Count); @@ -199,8 +227,10 @@ private void RegisterSqlClientAndTestRegistration(Action registrationFunc) Assert.Equal(1, providerTable.Rows.Count); DbProviderFactory factory = DbProviderFactories.GetFactory(providerTable.Rows[0]); Assert.NotNull(factory); +#pragma warning disable CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. Assert.Equal(typeof(System.Data.SqlClient.SqlClientFactory), factory.GetType()); Assert.Equal(System.Data.SqlClient.SqlClientFactory.Instance, factory); +#pragma warning restore CS0618 // 'SqlClientFactory' is obsolete: 'Use the Microsoft.Data.SqlClient package instead. } } } diff --git a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj index 454a1ce98fbe3..838785aff5d5b 100644 --- a/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj +++ b/src/libraries/System.Numerics.Tensors/src/System.Numerics.Tensors.csproj @@ -1,5 +1,5 @@ - + $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true @@ -146,6 +146,8 @@ + + diff --git a/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/netstandard/TensorPrimitives.Single.netstandard.cs b/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/netstandard/TensorPrimitives.Single.netstandard.cs index 563080bf742c2..99496107a6e04 100644 --- a/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/netstandard/TensorPrimitives.Single.netstandard.cs +++ b/src/libraries/System.Numerics.Tensors/src/System/Numerics/Tensors/netstandard/TensorPrimitives.Single.netstandard.cs @@ -1,6 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +extern alias Vectors; +using Vectors::System.Numerics; + using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; diff --git a/src/libraries/apicompat/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj index 15c5b617fe509..85f3b04d7ecf6 100644 --- a/src/libraries/apicompat/ApiCompat.proj +++ b/src/libraries/apicompat/ApiCompat.proj @@ -43,7 +43,7 @@ - +