address comments

dotnet · Jul 8, 2021 · 7cb962c · 7cb962c
1 parent a03edbc
commit 7cb962c
Show file tree

Hide file tree

Showing 18 changed files with 591 additions and 95 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -28,10 +28,6 @@
   <PropertyGroup>
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
-  <PropertyGroup>
-    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
-  </PropertyGroup>
-
   <ItemGroup Condition="$(BuildForRelease) == 'true'">
     <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>

diff --git a/...netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs b/...netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Data;
 using System.Runtime.InteropServices;
 
 internal static partial class Interop

diff --git a/...lient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs b/...lient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.Data;
 using System.Runtime.InteropServices;
 
 internal static partial class Interop

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.cs
@@ -2,9 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Net.Security;
 using System.Runtime.InteropServices;
-using Microsoft.Data;
 
 namespace System.Net
 {

diff --git a/...ft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs b/...ft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.cs
@@ -4,7 +4,6 @@
 
 using System.Net.Security;
 using System.Runtime.InteropServices;
-using Microsoft.Data;
 
 namespace System.Net
 {

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs b/src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.cs
@@ -2,11 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Net.Security;
 using System.Runtime.InteropServices;
-using Microsoft.Data;
 
 namespace System.Net
 {

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -878,5 +878,5 @@
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
   <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
   <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
-  <Import Project="$(ToolsDir)targets\GenerateResourceStringsSource.targets" />
+  <Import Project="$(NetCoreSource)tools\targets\GenerateResourceStringsSource.targets" />
 </Project>
diff --git a/...a.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.NetCoreApp.cs b/...a.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.NetCoreApp.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.ComponentModel;
 using System.Data.Common;
 using System.Diagnostics;