From 6779d295dc3c45fbcb2dc110fbc2ccc334225a45 Mon Sep 17 00:00:00 2001
From: "H. Yeo" <138053434+H-Yeo@users.noreply.github.com>
Date: Wed, 31 Jan 2024 14:40:05 -0800
Subject: [PATCH] Revert "Test Change in Pragma Directives"

This reverts commit 17f22ba5eda43a1d1d73ac93ed17ddf6581427cd.
---
 .../netcore/ref/Microsoft.Data.SqlClient.csproj             | 3 +--
 .../ref/Microsoft.Data.SqlClient.Batch.NetCoreApp.cs        | 6 +-----
 .../ref/Microsoft.Data.SqlClient.Batch.cs                   | 4 ----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index 069c0e3a2f..9d29c3009a 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -16,8 +16,7 @@
     <Compile Include="Microsoft.Data.SqlClient.cs" />
     <Compile Include="Microsoft.Data.SqlClient.Manual.cs" />
   </ItemGroup>
-  <!--<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">-->
-  <ItemGroup>  
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.cs" />
     <Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
   </ItemGroup>
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.NetCoreApp.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.NetCoreApp.cs
index b42bad5457..cc1fcee91b 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.NetCoreApp.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.NetCoreApp.cs
@@ -1,6 +1,4 @@
-#if NET6_0_OR_GREATER
-
-namespace Microsoft.Data.SqlClient
+namespace System.Data.Common
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommand.xml' path='docs/members[@name="SqlBatchCommand"]/SqlBatchCommand/*'/>
     public partial class SqlBatchCommand
@@ -9,5 +7,3 @@ public partial class SqlBatchCommand
         public Microsoft.Data.SqlClient.SqlCommandColumnEncryptionSetting ColumnEncryptionSetting { get { throw null; } set { } }
     }
 }
-
-#endif
diff --git a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.cs b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.cs
index 0b27415490..ae46015bb7 100644
--- a/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.cs
+++ b/src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.Batch.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NET6_0_OR_GREATER
-
 namespace Microsoft.Data.SqlClient
 {
     /// <include file='../../../doc/snippets/Microsoft.Data.SqlClient/SqlBatch.xml' path='docs/members[@name="SqlBatch"]/SqlBatch/*'/>
@@ -127,5 +125,3 @@ public sealed partial class SqlException
         public new Microsoft.Data.SqlClient.SqlBatchCommand BatchCommand { get { throw null; } }
     }
 }
-
-#endif