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

Jump to bottom

Move to Shared - SqlSer.cs #1313

Merged
merged 14 commits into from
Jan 12, 2022
Merged

Move to Shared - SqlSer.cs #1313

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
de412aa
Move to Shared - SqlSer.cs
Kaur-Parminder Oct 4, 2021
e2c1fb7
Merge branch 'dotnet:main' into Move-to-shared-SqlSer
Kaur-Parminder Oct 4, 2021
7bac1c8
Merge branch 'dotnet:main' into Move-to-shared-SqlSer
Kaur-Parminder Oct 6, 2021
77c2ae5
addressing reviewer's comment
Kaur-Parminder Oct 7, 2021
a929c73
Updating common class not to be partial
Kaur-Parminder Oct 7, 2021
78d284e
Merge branch 'dotnet:main' into Move-to-shared-SqlSer
Kaur-Parminder Oct 12, 2021
87c1526
Merge branch 'dotnet:main' into Move-to-shared-SqlSer
Kaur-Parminder Oct 13, 2021
0e2dafd
resolving conflicts in csproj
Kaur-Parminder Dec 20, 2021
e6b777c
addressing review comments
Kaur-Parminder Dec 23, 2021
95b6e46
Merge branch 'dotnet:main' into Move-to-shared-SqlSer
Kaur-Parminder Dec 23, 2021
0276924
VSCode suggestions
Kaur-Parminder Dec 23, 2021
500e56c
Added check for key in dictionary and addressed review comments
Kaur-Parminder Dec 24, 2021
7c98665
resolve merge
Kaur-Parminder Jan 10, 2022
bba0883
addressing comments
Kaur-Parminder Jan 10, 2022
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
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 @@ -364,6 +364,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlSer.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
<Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
</Compile>
Expand Down Expand Up @@ -559,7 +562,6 @@
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlAuthenticationProviderManager.cs" />

<Compile Include="Microsoft\Data\SqlClient\Server\SqlSer.cs" />
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBuffer.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
Expand Down
4 changes: 3 additions & 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 @@ -246,6 +246,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlSer.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlSer.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -626,7 +629,6 @@
<Compile Include="Microsoft\Data\SqlClient\Server\SmiLink.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiRequestExecutor.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\sqlser.cs" />
<Compile Include="Microsoft\Data\Sql\SqlGenericUtil.cs" />
</ItemGroup>
<ItemGroup Condition="'$(BuildSimulator)' == 'true'">
Expand Down
295 changes: 0 additions & 295 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/Server/sqlser.cs
View file
Open in desktop

This file was deleted.

28 changes: 22 additions & 6 deletions ...Microsoft/Data/SqlClient/Server/SqlSer.cs → ...Microsoft/Data/SqlClient/Server/SqlSer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ internal static SqlUserDefinedTypeAttribute GetUdtAttribute(Type t)
{
SqlUserDefinedTypeAttribute udtAttr = null;
object[] attr = GetCustomAttributes(t);

if (attr != null && attr.Length == 1)
{
udtAttr = (SqlUserDefinedTypeAttribute)attr[0];
Expand All @@ -155,17 +154,16 @@ internal static SqlUserDefinedTypeAttribute GetUdtAttribute(Type t)
private static Serializer GetNewSerializer(Type t)
{
SqlUserDefinedTypeAttribute udtAttr = GetUdtAttribute(t);
Format k = GetFormat(t);

switch (k)

switch (udtAttr.Format)
{
case Format.Native:
return new NormalizedSerializer(t);
case Format.UserDefined:
return new BinarySerializeSerializer(t);
case Format.Unknown: // should never happen, but fall through
default:
throw ADP.InvalidUserDefinedTypeSerializationFormat(k);
throw ADP.InvalidUserDefinedTypeSerializationFormat(udtAttr.Format);
}
}
}
Expand Down Expand Up @@ -209,7 +207,16 @@ internal BinarySerializeSerializer(Type t) : base(t)
public override void Serialize(Stream s, object o)
{
BinaryWriter w = new BinaryWriter(s);

#if NETFRAMEWORK
if (o is Microsoft.SqlServer.Server.IBinarySerialize)
{
((SqlServer.Server.IBinarySerialize)o).Write(w);
return;
}
Kaur-Parminder marked this conversation as resolved.
Show resolved Hide resolved
#endif
((IBinarySerialize)o).Write(w);

}

// Prevent inlining so that reflection calls are not moved
Expand All @@ -220,8 +227,17 @@ public override object Deserialize(Stream s)
{
object instance = Activator.CreateInstance(_type);
BinaryReader r = new BinaryReader(s);
((IBinarySerialize)instance).Read(r);

#if NETFRAMEWORK
if (instance is Microsoft.SqlServer.Server.IBinarySerialize)
{
((SqlServer.Server.IBinarySerialize)instance).Read(r);
return instance;
}
Kaur-Parminder marked this conversation as resolved.
Show resolved Hide resolved
#endif
((IBinarySerialize)instance).Read(r);
return instance;

}
}

Expand Down