Add netcoreapp2.1 build for System.Data.SqlClient

Commit migrated from https://github.com/dotnet/corefx/commit/9784d6aadef8e5b19ba192444b767c0f93652ff7

diff --git a/src/libraries/System.Data.SqlClient/ref/Configurations.props b/src/libraries/System.Data.SqlClient/ref/Configurations.props
index a77a5c9..df79e9d 100644 (file)
--- a/src/libraries/System.Data.SqlClient/ref/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/ref/Configurations.props
@@ -2,12 +2,13 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PackageConfigurations>
+      netcoreapp2.1;
       netstandard;
       net461;
-      netcoreapp;
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
+      netcoreapp;
       netfx;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
index faf450e..558c616 100644 (file)
--- a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
@@ -9,7 +9,7 @@
     <Compile Include="System.Data.SqlClient.cs" />
     <Compile Include="System.Data.SqlClient.Manual.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetsNETCoreApp)' == 'true'">
     <Compile Include="System.Data.SqlClient.NetCoreApp.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
@@ -18,6 +18,15 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.1'">
+    <Reference Include="System.Runtime" />
+    <Reference Include="System.Runtime.Extensions" />
+    <Reference Include="System.Data.Common" />
+    <Reference Include="System.Collections.NonGeneric" />
+    <Reference Include="System.ComponentModel.Primitives" />
+    <Reference Include="System.Xml.ReaderWriter" />
+    <Reference Include="System.Runtime.InteropServices" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />

diff --git a/src/libraries/System.Data.SqlClient/src/Configurations.props b/src/libraries/System.Data.SqlClient/src/Configurations.props
index 1b30ec7..d031687 100644 (file)
--- a/src/libraries/System.Data.SqlClient/src/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/src/Configurations.props
@@ -8,14 +8,17 @@
       netstandard1.3;
       netstandard;
       net461-Windows_NT;
-      netcoreapp;
-      netcoreapp-Unix;
-      netcoreapp-Windows_NT;
+      netcoreapp2.1;
+      netcoreapp2.1-Unix;
+      netcoreapp2.1-Windows_NT;
       uap10.0.16299-Windows_NT;
       uap-Windows_NT;
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
+      netcoreapp;
+      netcoreapp-Unix;
+      netcoreapp-Windows_NT;
       netfx-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>

diff --git a/src/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp b/src/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
deleted file mode 100644 (file)
index 5c06489..0000000
--- a/src/libraries/System.Data.SqlClient/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/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netstandard b/src/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.windows
similarity index 100%
rename from src/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.netstandard
rename to src/libraries/System.Data.SqlClient/src/PinvokeAnalyzerExceptionList.analyzerdata.windows

diff --git a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index 618de17..7891ffd 100644 (file)
--- a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -10,10 +10,10 @@
     <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.1.0.0</AssemblyVersion>
     <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uap10.0.16299-Windows_NT-Debug;uap10.0.16299-Windows_NT-Release</Configurations>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp' OR '$(IsUAPAssembly)' == 'true' ">
+  <ItemGroup Condition="'$(TargetGroup)' == 'netstandard' OR '$(TargetsNetCoreApp)' == 'true' OR '$(IsUAPAssembly)' == 'true' ">
     <Compile Include="System.Data.SqlClient.TypeForwards.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\Data\SqlClient\PoolBlockingPeriod.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS'">
@@ -210,11 +210,11 @@
     <Compile Include="System\Data\SqlClient\SqlCredential.cs" />
   </ItemGroup>
   <!-- SqlFileStream Unix Netcoreapp only -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND '$(TargetsUnix)' == 'true'">
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' AND '$(TargetsUnix)' == 'true'">
     <Compile Include="System\Data\SqlClient\SqlFileStream.Unsupported.cs" />
   </ItemGroup>
   <!-- SqlFileStream Windows Netcoreapp only -->
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp' AND '$(TargetsWindows)' == 'true'">
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true' AND '$(TargetsWindows)' == 'true'">
     <Compile Include="$(CommonPath)\CoreLib\Interop\Windows\kernel32\Interop.FileTypes.cs">
       <Link>Common\CoreLib\Interop\Windows\kernel32\Interop.FileTypes.cs</Link>
     </Compile>
@@ -262,16 +262,17 @@
     </Compile>
     <Compile Include="System\Data\SqlClient\SqlFileStream.Windows.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true' AND '$(OSGroup)' != 'AnyOS' AND '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\Data\Common\DbConnectionStringCommon.NetCoreApp.cs" />
     <Compile Include="System\Data\ProviderBase\DbConnectionPool.NetCoreApp.cs" />
     <Compile Include="System\Data\SqlClient\SqlConnectionString.NetCoreApp.cs" />
     <Compile Include="System\Data\SqlClient\SqlConnectionStringBuilder.NetCoreApp.cs" />
   </ItemGroup>
   <!-- Manage the SNI toggle for Windows netstandard and UWP -->
-  <ItemGroup Condition="('$(TargetGroup)' == 'netstandard' OR '$(TargetGroup)' == 'netcoreapp') AND '$(TargetsWindows)' == 'true'">
+  <ItemGroup Condition="('$(TargetGroup)' == 'netstandard' OR '$(TargetsNetCoreApp)' == 'true') AND '$(TargetsWindows)' == 'true'">
     <!-- Manage the SNI toggle for Windows netstandard and UWP -->
     <Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
+    <AdditionalFiles Include="$(MSBuildProjectDirectory)/*.analyzerdata.windows" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsUAPAssembly)' == 'true'">
     <Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
@@ -521,7 +522,7 @@
     <Reference Include="System.Net.Primitives" />
     <Reference Include="System.Net.NameResolution" />
   </ItemGroup>
-  <ItemGroup Condition="('$(OSGroup)' != 'AnyOS' AND '$(IsUAPAssembly)' == 'true') OR '$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="('$(OSGroup)' != 'AnyOS' AND '$(IsUAPAssembly)' == 'true') OR '$(TargetsNetCoreApp)' == 'true'">
     <Reference Include="System.Transactions.Local" />
     <Reference Include="System.Collections.NonGeneric" />
   </ItemGroup>
@@ -534,7 +535,7 @@
       <LogicalName>System.Data.SqlClient.SqlMetaData.xml</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Reference Include="System.Runtime.Extensions" />
     <Reference Include="System.Data.Common" />
     <Reference Include="System.ComponentModel.Primitives" />