Skip to content

Commit

Permalink
Merge | SqlFileStream (Opt 1) (#2898)
Browse files Browse the repository at this point in the history
* Moving SqlFileStream from netcore to common project

* WIP merge file

* Remove netfx interop classes that will be replaced with netcore interop

* Bring PathInternal methods into SqlFileStream, remove the PathInternal file.

* Simple merging

* Merge GetFullPathInternal

* Add security quality of service to common interop libraries

* I think that merges OpenSqlFileStream

* Bring in the interop for getting path names in netfx.
Seems like a lot of hassle for little benefit :/

* Most of the work to make the shared copy work with netfx

* Rewriting CreateFile to take security QoS on netfx and not on netcore

* * Fix bug in merged class
* Fix annoyance with failing unit test setup

* * SystemMemoryVersion in versions.props
* Use variable versions
* Remove output type from common project

* Remove dependency on System.Memory

* Moving code around to match standards

* Fix indenting to make next commit cleaner

* Cleanup interop files

* Cleaning up using statements and constants

* Cleanup member variables

* Make objectID back into a member variable. No need for it to be a property.

* Introduce ThrowIfDisposed

* * Remove setters for Name and TransactionContext
* Normalize the path *once*

* * Remove unnecessary fully-qualified namespace prefixes
* Fix method signatures (modifier order, argument formatting)
* Touching up comments

* Removing redundant debugs from GetFullNameInternal

* Improving GetFullPathNameNetfx

* Improving open file stream code
  • Loading branch information
benrr101 authored Oct 25, 2024
1 parent ac1b3fb commit 2e163b2
Show file tree
Hide file tree
Showing 14 changed files with 1,232 additions and 1,235 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,9 @@
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Kernel32\Interop.FileTypes.cs">
<Link>Common\Interop\Windows\Kernel32\Interop.FileTypes.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Kernel32\Interop.GetFullPathName.cs">
<Link>Common\Interop\Windows\Kernel32\Interop.GetFullPathName.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)\Interop\Windows\Kernel32\Interop.IoControlCodeAccess.cs">
<Link>Common\Interop\Windows\Kernel32\Interop.IoControlCodeAccess.cs</Link>
</Compile>
Expand All @@ -722,6 +725,9 @@
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\Interop.RtlNtStatusToDosError.cs">
<Link>Common\Interop\Windows\NtDll\Interop.RtlNtStatusToDosError.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)\Interop\Windows\NtDll\Interop.SecurityQualityOfService.cs">
<Link>Common\Interop\Windows\NtDll\Interop.SecurityQualityOfService.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
</Compile>
Expand Down Expand Up @@ -749,6 +755,10 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs">
<Link>Microsoft\Data\SqlClient\TdsParserSafeHandles.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs</Link>
</Compile>

<Compile Include="Common\Interop\Windows\Crypt32\Interop.certificates.cs" />
<Compile Include="Common\Interop\Windows\Crypt32\Interop.certificates_types.cs" />
<Compile Include="Common\Interop\Windows\Kernel32\Interop.CloseHandle.cs" />
Expand All @@ -775,7 +785,6 @@
<Compile Include="Common\Interop\Windows\sspicli\SSPIWrapper.cs" />
<Compile Include="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" />
<Compile Include="Common\System\Collections\Generic\BidirectionalDictionary.cs" />
<Compile Include="Common\System\IO\PathInternal.Windows.cs" />
<Compile Include="Common\System\Net\ContextFlagsAdapterPal.Windows.cs" />
<Compile Include="Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs" />
<Compile Include="Common\System\Net\Security\NegotiateStreamPal.Windows.cs" />
Expand All @@ -792,7 +801,6 @@
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
<Compile Include="Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs" />
</ItemGroup>

<!-- Unix only -->
Expand Down
Loading

0 comments on commit 2e163b2

Please sign in to comment.