Skip to content

Commit 70ec559

Browse files
authored
Merge | Remove Extraneous Files (#3781)
* Remove MatchingRefApiCompatBaseline.txt * Move TypeForwards to common project * removing netcore editorconfig, should use solution-wide .editorconfig going forward * Remove pinvoke exception file, should be covered via APIScan * Remove netfx .editorconfig, should use solution-wide .editorconfig going forward * Remove netfx GenerateThisAssemblyCs.targets and use the common one This is adds the NugetPackageVersion field to the netfx project, but since these are internal fields, it should not matter.
1 parent a65b8a4 commit 70ec559

File tree

8 files changed

+8
-134
lines changed

8 files changed

+8
-134
lines changed

src/Microsoft.Data.SqlClient/netcore/src/.editorconfig

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,9 @@
861861
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
862862
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
863863
</Compile>
864-
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
864+
<Compile Include="$(CommonSourceRoot)TypeForwards.netcore.cs">
865+
<Link>TypeForwards.netcore.cs</Link>
866+
</Compile>
865867
</ItemGroup>
866868

867869
<!-- Windows only -->

src/Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netfx/src/.editorconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@
10801080
<PackageReference Include="System.ValueTuple" />
10811081
<PackageReference Include="System.Threading.Channels" />
10821082
</ItemGroup>
1083-
<Import Project="$(NetFxSource)tools\targets\GenerateThisAssemblyCs.targets" />
1083+
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
10841084
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyRef.targets" />
10851085
<Import Project="$(NetFxSource)tools\targets\GenerateAssemblyInfo.targets" />
10861086
</Project>

src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets

Lines changed: 0 additions & 44 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.TypeForwards.cs renamed to src/Microsoft.Data.SqlClient/src/TypeForwards.netcore.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET
6+
57
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlDbType))]
68
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.StatementCompletedEventArgs))]
79
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.StatementCompletedEventHandler))]
@@ -26,3 +28,5 @@
2628
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTruncateException))]
2729
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTypeException))]
2830
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlXml))]
31+
32+
#endif

0 commit comments

Comments
 (0)