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 AlwaysEncryptedHelperClasses, TdsParserHelperClasses #2376

Merged
merged 15 commits into from
Oct 5, 2024
Merged

Merge AlwaysEncryptedHelperClasses, TdsParserHelperClasses #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
03e67f1
Factored relevant netfx classes into AlwaysEncryptedHelperClasses.cs …
edwardneal Feb 28, 2024
152a3ab
Removed unused "normalizationRuleVersion" field from SqlEncryptionKey…
edwardneal Feb 28, 2024
fe0b79e
Merged AlwaysEncryptedHelperClasses.cs
edwardneal Feb 28, 2024
c085981
Updated merged file to fit coding-style.md. Renaming internally-acces…
edwardneal Feb 28, 2024
89f5a63
Split the classes in TdsParserHelperClasses.cs into project-specific …
edwardneal Feb 28, 2024
ebe5428
Merged TdsParserHelperClasses.cs. Made one change to _SqlMetaDataSet …
edwardneal Feb 28, 2024
6b29f40
Applied coding style to the merged TdsParserClasses.cs file.
edwardneal Feb 28, 2024
28e6484
Correcting tests which used reflection to access internal fields
edwardneal Feb 28, 2024
4e6da43
Merge main
edwardneal Aug 22, 2024
3386b39
Changed accessibility modifiers and names of merged classes
edwardneal Aug 22, 2024
b015e32
Merged TdsParserHelperClasses - removed per-platform files
edwardneal Aug 22, 2024
6487b50
Further correction to reflection-based test
edwardneal Aug 22, 2024
4629659
Reverting member name/visibility linting
edwardneal Aug 24, 2024
9422905
Code review feedback
edwardneal Aug 24, 2024
e201544
Responding to code review
edwardneal Oct 4, 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
8 changes: 6 additions & 2 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 @@ -165,6 +165,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
</Compile>
Expand Down Expand Up @@ -591,6 +594,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
<Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.cs">
<Link>Microsoft\Data\SqlClient\TdsParserStateObject.cs</Link>
</Compile>
Expand Down Expand Up @@ -638,7 +644,6 @@
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionInternal.cs" />
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPool.cs" />
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
<Compile Include="Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs" />
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
<Compile Include="Microsoft\Data\SqlClient\Reliability\SqlConfigurableRetryLogicManager.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\ConcurrentQueueSemaphore.cs" />
Expand Down Expand Up @@ -683,7 +688,6 @@
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.NetCoreApp.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netcore.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
<Compile Include="Microsoft\Data\SqlTypes\SqlTypeWorkarounds.netcore.cs" />
Expand Down
11 changes: 8 additions & 3 deletions 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 @@ -30,14 +30,14 @@
<!-- Override debugtype=portable in Directory.Build.props for netfx -->
<PropertyGroup>
<DebugType>full</DebugType>
</PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)\$(TargetFramework)','$(GeneratedSourceFileName)'))</TargetFrameworkMonikerAssemblyAttributesPath>
</PropertyGroup>
<ItemGroup>
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
<EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
</ItemGroup>
</ItemGroup>
<PropertyGroup>
<!-- CSC Compiler Options -->
<NoConfig>True</NoConfig>
Expand Down Expand Up @@ -213,6 +213,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedEnclaveProviderUtils.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedHelperClasses.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs">
<Link>Microsoft\Data\SqlClient\AlwaysEncryptedKeyConverter.cs</Link>
</Compile>
Expand Down Expand Up @@ -624,6 +627,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs">
<Link>Microsoft\Data\SqlClient\TdsRecordBufferSetter.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
<Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserSessionPool.cs">
<Link>Microsoft\Data\SqlClient\TdsParserSessionPool.cs</Link>
</Compile>
Expand Down Expand Up @@ -712,7 +718,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReaderSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserHelperClasses.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />
<Compile Include="Microsoft\Data\SqlTypes\SqlFileStream.cs" />
<Compile Include="Microsoft\Data\SqlTypes\SqlStreamChars.cs" />
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1676,15 +1676,15 @@ override public DataTable GetSchemaTable()
try
{
statistics = SqlStatistics.StartTimer(Statistics);
if (_metaData == null || _metaData._schemaTable == null)
if (_metaData == null || _metaData.schemaTable == null)
{
if (this.MetaData != null)
{
_metaData._schemaTable = BuildSchemaTable();
Debug.Assert(_metaData._schemaTable != null, "No schema information yet!");
_metaData.schemaTable = BuildSchemaTable();
Debug.Assert(_metaData.schemaTable != null, "No schema information yet!");
}
}
return _metaData?._schemaTable;
return _metaData?.schemaTable;
}
finally
{
Expand Down Expand Up @@ -4823,7 +4823,7 @@ internal TdsOperationStatus TrySetMetaData(_SqlMetaDataSet metaData, bool moreIn
_tableNames = null;
if (_metaData != null)
{
_metaData._schemaTable = null;
_metaData.schemaTable = null;
_data = SqlBuffer.CreateBufferArray(metaData.Length);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ private void EnableSsl(uint info, SqlConnectionEncryptOption encrypt, bool integ
ThrowExceptionAndWarning(_physicalStateObj);
}

string warningMessage = SslProtocolsHelper.GetProtocolWarning(protocolVersion);
string warningMessage = ((System.Security.Authentication.SslProtocols)protocolVersion).GetProtocolWarning();
if (!string.IsNullOrEmpty(warningMessage))
{
if (!encrypt && LocalAppContextSwitches.SuppressInsecureTLSWarning)
Expand Down
Loading
Loading