Skip to content
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

Merge | SqlFileStream (Opt 1) #2898

Merged
merged 29 commits into from
Oct 25, 2024
Merged

Merge | SqlFileStream (Opt 1) #2898

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ad196e6
Moving SqlFileStream from netcore to common project
benrr101 Sep 25, 2024
630999a
WIP merge file
benrr101 Sep 26, 2024
f91e6a9
Remove netfx interop classes that will be replaced with netcore interop
benrr101 Sep 28, 2024
1311bed
Bring PathInternal methods into SqlFileStream, remove the PathInterna…
benrr101 Sep 28, 2024
7cf9fd6
Simple merging
benrr101 Sep 28, 2024
85a4ecf
Merge GetFullPathInternal
benrr101 Sep 28, 2024
d837aca
Add security quality of service to common interop libraries
benrr101 Sep 30, 2024
ab82731
I think that merges OpenSqlFileStream
benrr101 Sep 30, 2024
7b329f8
Bring in the interop for getting path names in netfx.
benrr101 Sep 30, 2024
a1e10e0
Most of the work to make the shared copy work with netfx
benrr101 Oct 1, 2024
a5a2c78
Rewriting CreateFile to take security QoS on netfx and not on netcore
benrr101 Oct 1, 2024
aafaafd
* Fix bug in merged class
benrr101 Oct 3, 2024
a20bb63
* SystemMemoryVersion in versions.props
benrr101 Oct 7, 2024
bbc79ab
Remove dependency on System.Memory
benrr101 Oct 10, 2024
2348d8a
Moving code around to match standards
benrr101 Oct 1, 2024
0d995c9
Fix indenting to make next commit cleaner
benrr101 Oct 2, 2024
1981080
Cleanup interop files
benrr101 Oct 2, 2024
7c7059c
Cleaning up using statements and constants
benrr101 Oct 2, 2024
9c6d90e
Cleanup member variables
benrr101 Oct 2, 2024
226e7aa
Make objectID back into a member variable. No need for it to be a pro…
benrr101 Oct 2, 2024
f039d5f
Introduce ThrowIfDisposed
benrr101 Oct 2, 2024
524723d
* Remove setters for Name and TransactionContext
benrr101 Oct 3, 2024
32c8de1
* Remove unnecessary fully-qualified namespace prefixes
benrr101 Oct 3, 2024
e3a2dea
Removing redundant debugs from GetFullNameInternal
benrr101 Oct 3, 2024
a73743f
Improving GetFullPathNameNetfx
benrr101 Oct 3, 2024
efad644
Improving open file stream code
benrr101 Oct 3, 2024
ffcdee0
Merge branch 'main' into common-sqlfilestream-smallercleanup
benrr101 Oct 14, 2024
f05e718
Merge branch 'main' into common-sqlfilestream-smallercleanup
benrr101 Oct 24, 2024
967e888
Merge branch 'main' into common-sqlfilestream-smallercleanup
benrr101 Oct 25, 2024
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
428 changes: 0 additions & 428 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/System/IO/PathInternal.Windows.cs
View file
Open in desktop

This file was deleted.

14 changes: 11 additions & 3 deletions 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 @@ -614,7 +614,7 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
<Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
</Compile>

<Compile Include="Common\Microsoft\Data\ProviderBase\DbConnectionInternal.cs" />
<Compile Include="Common\System\NotImplemented.cs" />
<Compile Include="Common\System\Net\ContextFlagsPal.cs" />
Expand Down Expand Up @@ -700,6 +700,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 @@ -721,6 +724,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 @@ -748,6 +754,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 @@ -774,7 +784,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 @@ -791,7 +800,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
Loading