diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj index 1efdfeb5fc..ba9d31934e 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj @@ -323,6 +323,7 @@ + diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs index 0e64b091b6..3fa4c6644f 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/SqlServerTypesTest.cs @@ -2,20 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -#if NETFRAMEWORK using System; -using System.Globalization; -using Microsoft.SqlServer.Types; -#else -using System.Collections.ObjectModel; -using System.Data.Common; -#endif using System.Collections.Generic; +using System.Collections.ObjectModel; using System.Data; +using System.Data.Common; using System.Data.SqlTypes; +using System.Globalization; using System.IO; using System.Linq; using System.Text; +using Microsoft.SqlServer.Types; using Xunit; namespace Microsoft.Data.SqlClient.ManualTesting.Tests @@ -49,27 +46,6 @@ public static void GetSchemaTableTest() } // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'. - [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] - [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] - public static void GetValueTestThrowsExceptionOnNetCore() - { - using (SqlConnection conn = new SqlConnection(DataTestUtility.TCPConnectionString)) - using (SqlCommand cmd = new SqlCommand("select hierarchyid::Parse('/1/') as col0", conn)) - { - conn.Open(); - using (SqlDataReader reader = cmd.ExecuteReader()) - { - Assert.True(reader.Read()); - - // SqlHierarchyId is part of Microsoft.SqlServer.Types, which is not supported in Core - Assert.Throws(() => reader.GetValue(0)); - Assert.Throws(() => reader.GetSqlValue(0)); - } - } - } - - // Synapse: Parse error at line: 1, column: 48: Incorrect syntax near 'hierarchyid'. - [SkipOnTargetFramework(TargetFrameworkMonikers.Netcoreapp)] [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void GetValueTest() { @@ -274,7 +250,7 @@ private static void TestUdtSqlDataReaderGetStream(CommandBehavior behavior) } } } -#if NETCOREAPP + // Synapse: Parse error at line: 1, column: 41: Incorrect syntax near 'hierarchyid'. [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestUdtSchemaMetadata() @@ -313,7 +289,7 @@ public static void TestUdtSchemaMetadata() } } } -#endif + // Synapse: Parse error at line: 1, column: 8: Incorrect syntax near 'geometry'. [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))] public static void TestUdtParameterSetSqlByteValue() @@ -411,7 +387,6 @@ private static string ToHexString(byte[] bytes) return hex.ToString(); } -#if NETFRAMEWORK private static string GetUdtName(Type udtClrType) { if (typeof(SqlHierarchyId) == udtClrType) @@ -518,6 +493,5 @@ public static void TestSqlServerTypesInsertAndRead() DataTestUtility.DropTable(conn, tableName); } } -#endif } } diff --git a/tools/props/Versions.props b/tools/props/Versions.props index b36aa6386a..65ab81e751 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -78,6 +78,7 @@ 2.0.8 170.8.0 10.50.1600.1 + 160.1000.6 0.13.2 6.0.0