Skip to content

Merge | Remove Extraneous Files #3781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 21, 2025
+8 −134
Merged

Merge | Remove Extraneous Files #3781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22a894d
Remove MatchingRefApiCompatBaseline.txt
benrr101 Nov 18, 2025
706dc15
Move TypeForwards to common project
benrr101 Nov 18, 2025
ccbc69f
removing netcore editorconfig, should use solution-wide .editorconfig…
benrr101 Nov 18, 2025
79efe52
Remove pinvoke exception file, should be covered via APIScan
benrr101 Nov 18, 2025
5c5946e
Remove netfx .editorconfig, should use solution-wide .editorconfig go…
benrr101 Nov 18, 2025
55f5bf0
Remove netfx GenerateThisAssemblyCs.targets and use the common one
benrr101 Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/Microsoft.Data.SqlClient/netcore/src/.editorconfig
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/Microsoft.Data.SqlClient/netcore/src/MatchingRefApiCompatBaseline.txt
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
44 changes: 0 additions & 44 deletions ...Microsoft.Data.SqlClient/netcore/src/PinvokeAnalyzerExceptionList.analyzerdata.netcoreapp
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions src/Microsoft.Data.SqlClient/netfx/src/.editorconfig
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
44 changes: 0 additions & 44 deletions src/Microsoft.Data.SqlClient/netfx/tools/targets/GenerateThisAssemblyCs.targets
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions .../Microsoft.Data.SqlClient.TypeForwards.cs → ...ata.SqlClient/src/TypeForwards.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))]
Expand All @@ -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
Loading