diff --git a/src/Microsoft.Data.SqlClient/netcore/src/.editorconfig b/src/Microsoft.Data.SqlClient/netcore/src/.editorconfig
deleted file mode 100644
index b45670d5f5..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/src/.editorconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = false
-
-[*.cs]
-
-# IDE0090: Use 'new(...)'
-csharp_style_implicit_object_creation_when_type_is_apparent = false
-
-# IDE0063: Use simple 'using' statement
-csharp_prefer_simple_using_statement = false
-
-# SYSLIB0039: Type or member is obsolete
-dotnet_diagnostic.SYSLIB0039.severity = suggestion
-
-# CA1310: Specify StringComparison for correctness
-dotnet_diagnostic.CA1310.severity = error
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt b/src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt
deleted file mode 100644
index 6805b94289..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# netstandard dll has been shipped with IDbColumnSchemaGenerator inherited and SqlDataReader.GetColumnScheme() implemented in source, but not exposed in ref contract.
-# Removing SqlDataReader.GetColumnScheme() from netstandard implementation potentially breaks existing customer source code
-# that utilizes SqlDataReader.GetColumnScheme() indirectly by casting SqlDataReader to IDbColumnSchemaGenerator type.
-# In order to prevent it, the API needs to be kept in public, and following 5 error message should be remaining in this baseline file.
-#
-# PoolBlockingPeriod was not added until .NET Framework 4.6.2, hence, the respective APIs are netcoreapp specific only. 
-Compat issues with assembly Microsoft.Data.SqlClient:
-CannotRemoveBaseTypeOrInterface : Type 'Microsoft.Data.SqlClient.SqlDataReader' does not implement interface 'System.Data.Common.IDbColumnSchemaGenerator' in the reference but it does in the implementation.
-MembersMustExist : Member 'Microsoft.Data.SqlClient.SqlDataReader.GetColumnSchema()' does not exist in the reference but it does exist in the implementation.
-TypesMustExist : Type 'Microsoft.Data.SqlClient.PoolBlockingPeriod' does not exist in the reference but it does exist in the implementation.
-MembersMustExist : Member 'Microsoft.Data.SqlClient.SqlConnectionStringBuilder.PoolBlockingPeriod.get()' does not exist in the reference but it does exist in the implementation.
-MembersMustExist : Member 'Microsoft.Data.SqlClient.SqlConnectionStringBuilder.PoolBlockingPeriod.set(Microsoft.Data.SqlClient.PoolBlockingPeriod)' does not exist in the reference but it does exist in the implementation.
-Total Issues: 5
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
index 950d7f83b1..32b9e76c98 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -861,7 +861,9 @@
     <Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
       <Link>System\Diagnostics\CodeAnalysis.cs</Link>
     </Compile>
-    <Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
+    <Compile Include="$(CommonSourceRoot)TypeForwards.netcore.cs">
+      <Link>TypeForwards.netcore.cs</Link>
+    </Compile>
   </ItemGroup>
 
   <!-- Windows only -->
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp b/src/Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
deleted file mode 100644
index 5c0648966d..0000000000
--- a/src/Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Not a bug. sni.dll is a native component that ships as part of the package. -->
-kernel32.dll!LoadLibraryExW
-sni.dll!GetSniMaxComposedSpnLength
-sni.dll!SNIAddProviderWrapper
-sni.dll!SNICheckConnectionWrapper
-sni.dll!SNICloseWrapper
-sni.dll!SNIGetInfoWrapper
-sni.dll!SNIGetLastError
-sni.dll!SNIInitialize
-sni.dll!SNIOpenSyncExWrapper
-sni.dll!SNIOpenWrapper
-sni.dll!SNIPacketAllocateWrapper
-sni.dll!SNIPacketGetDataWrapper
-sni.dll!SNIPacketRelease
-sni.dll!SNIPacketResetWrapper
-sni.dll!SNIPacketSetData
-sni.dll!SNIQueryInfo
-sni.dll!SNIReadAsyncWrapper
-sni.dll!SNIReadSyncOverAsync
-sni.dll!SNIRemoveProviderWrapper
-sni.dll!SNISecGenClientContextWrapper
-sni.dll!SNISecInitPackage
-sni.dll!SNISetInfoWrapper
-sni.dll!SNITerminate
-sni.dll!SNIWaitForSSLHandshakeToCompleteWrapper
-sni.dll!SNIWriteAsyncWrapper
-sni.dll!SNIWriteSyncOverAsync
-sni.dll!UnmanagedIsTokenRestricted
-sspicli.dll!AcceptSecurityContext
-sspicli.dll!AcquireCredentialsHandleW
-sspicli.dll!ApplyControlToken
-sspicli.dll!CompleteAuthToken
-sspicli.dll!DecryptMessage
-sspicli.dll!DeleteSecurityContext
-sspicli.dll!EncryptMessage
-sspicli.dll!EnumerateSecurityPackagesW
-sspicli.dll!FreeContextBuffer
-sspicli.dll!FreeCredentialsHandle
-sspicli.dll!InitializeSecurityContextW
-sspicli.dll!QueryContextAttributesW
-sspicli.dll!QuerySecurityContextToken
-sspicli.dll!SetContextAttributesW
-sspicli.dll!SspiEncodeStringsAsAuthIdentity
-sspicli.dll!SspiFreeAuthIdentity
\ No newline at end of file
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/.editorconfig b/src/Microsoft.Data.SqlClient/netfx/src/.editorconfig
deleted file mode 100644
index f6fe9011f8..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/src/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# editorconfig.org
-
-# top-most EditorConfig file
-root = false
-
-[*.cs]
-
-# IDE0090: Use 'new(...)'
-csharp_style_implicit_object_creation_when_type_is_apparent = false
-
-# CA1310: Specify StringComparison for correctness
-dotnet_diagnostic.CA1310.severity = error
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 104b9261e7..36a87b4eb2 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -1080,7 +1080,7 @@
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="System.Threading.Channels" />
   </ItemGroup>
-  <Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
+  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
   <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
   <Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets b/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets
deleted file mode 100644
index 35ab47239d..0000000000
--- a/src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Compile Include="$(IntermediateOutputPath)ThisAssembly.cs"/>
-  </ItemGroup>
-
-  <Target Name="GenerateThisAssemblyCs"
-          BeforeTargets="CoreCompile">
-    <PropertyGroup>
-      <ThisAssemblyCsContents>
-namespace System
-{
-internal static class ThisAssembly
-{
-internal const string InformationalVersion = "$(AssemblyFileVersion)"%3B
-}
-}
-      </ThisAssemblyCsContents>
-    </PropertyGroup>
-
-    <!-- Get the last version number we built with (if any) -->
-    <ReadLinesFromFile
-      Condition="Exists('$(IntermediateOutputPath)LastVersionNumber')"
-      File="$(IntermediateOutputPath)LastVersionNumber">
-      <Output TaskParameter="Lines" PropertyName="LastVersionNumber"/>
-    </ReadLinesFromFile>
-
-    <!-- Write ThisAssembly.cs if this is a new version number, or it is missing -->
-    <WriteLinesToFile
-      Condition="('$(LastVersionNumber)'!='$(AssemblyFileVersion)') or !Exists('$(IntermediateOutputPath)ThisAssembly.cs')"
-      File="$(IntermediateOutputPath)ThisAssembly.cs"
-      Lines="$(ThisAssemblyCsContents)"
-      Overwrite="true"
-      Encoding="Unicode"/>
-
-    <!-- Write the new version number (if it has changed) -->
-    <WriteLinesToFile
-      Condition="'$(LastVersionNumber)'!='$(AssemblyFileVersion)'"
-      File="$(IntermediateOutputPath)LastVersionNumber"
-      Lines="$(AssemblyFileVersion)"
-      Overwrite="true"
-      Encoding="Unicode"/>
-  </Target>
-</Project>
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.TypeForwards.cs b/src/Microsoft.Data.SqlClient/src/TypeForwards.netcore.cs
similarity index 99%
rename from src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.TypeForwards.cs
rename to src/Microsoft.Data.SqlClient/src/TypeForwards.netcore.cs
index 1a726d07cc..96f635b7c7 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.TypeForwards.cs
+++ b/src/Microsoft.Data.SqlClient/src/TypeForwards.netcore.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlDbType))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.StatementCompletedEventArgs))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.StatementCompletedEventHandler))]
@@ -26,3 +28,5 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTruncateException))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTypeException))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlXml))]
+
+#endif