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

FIX | Removing BinaryFormatter from NetFx #869

Merged
merged 14 commits into from
Feb 18, 2021
Merged

FIX | Removing BinaryFormatter from NetFx #869

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
68bce5a
Removing BinaryFormatter from NetFx
Jan 7, 2021
910ffed
Merge branch 'master' of https://github.com/dotnet/SqlClient into Rem…
Jan 19, 2021
316c036
review comments
Jan 21, 2021
4f22171
fix version typo
Jan 21, 2021
8ede142
remove extra line
Jan 21, 2021
8df3fcf
Reverted SqlException Test
Jan 21, 2021
cc0aca0
review comments
Jan 21, 2021
fe12461
Review comment
Jan 26, 2021
c93ca0a
Desrialize
Jan 29, 2021
b613194
addressing review comments
Feb 8, 2021
a4dc381
Fix exception in deserialization (#1)
karinazhou Feb 16, 2021
233b8fe
review comments
Feb 18, 2021
44a9144
add extra line to the end of strings designer
Feb 18, 2021
688091b
end of line
Feb 18, 2021
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
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
jJRahnama committed Jan 21, 2021
commit 316c036d844a33da25d90d77597eeea29997b4fd
13 changes: 3 additions & 10 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDependency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using System.Runtime.CompilerServices;
using System.Runtime.Remoting;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using System.Runtime.Versioning;
using System.Security.Permissions;
using System.Text;
Expand Down Expand Up @@ -250,20 +249,14 @@ private static void InvokeCallback(object eventContextPair)
private class SqlClientObjRef : IExtensibleDataObject
{
[DataMember]
private static ObjRef SqlObjRef;
private static ObjRef s_sqlObjRef;

public SqlClientObjRef(SqlDependencyProcessDispatcher dispatcher)
{
SqlObjRef = RemotingServices.Marshal(dispatcher);
s_sqlObjRef = RemotingServices.Marshal(dispatcher);
}

private ExtensionDataObject _extensionData_Value;

public ExtensionDataObject ExtensionData
{
get => _extensionData_Value;
set => _extensionData_Value = value;
}
public ExtensionDataObject ExtensionData { get; set; }
}
// ------------------------------------------
// End SqlClientObjRef private class.
Expand Down
22 changes: 0 additions & 22 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlExceptionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,6 @@ public void SerializationTest()
Assert.Equal(e.StackTrace, sqlEx.StackTrace);
}

[Fact]
[ActiveIssue("12161", TargetFrameworkMonikers.Netcoreapp)]

public static void SqlExcpetionSerializationTest()
{
var formatter = new BinaryFormatter();
SqlException e = CreateException();
using (var stream = new MemoryStream())
{
try
{
formatter.Serialize(stream, e);
stream.Position = 0;
var e2 = (SqlException)formatter.Deserialize(stream);
}
catch (Exception ex)
{
Assert.False(true, $"Unexpected Exception occurred: {ex.Message}");
}
}
}

[Fact]
public void JSONSerializationTest()
{
Expand Down
4 changes: 2 additions & 2 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<PropertyGroup>
<MicrosoftDotNetPlatformAbstractionsVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsVersion>
<MicrosoftIdentityModelClientsActiveDirectoryVersion>5.2.6</MicrosoftIdentityModelClientsActiveDirectoryVersion>
<MicrosoftNETTestSdkVersion>16.8.3</MicrosoftNETTestSdkVersion>
<MicrosoftWindowsCompatibilityVersion>3.1.1</MicrosoftWindowsCompatibilityVersion>
<MicrosoftNETTestSdkVersion>15.9.0</MicrosoftNETTestSdkVersion>
<MicrosoftWindowsCompatibilityVersion>3.1.0</MicrosoftWindowsCompatibilityVersion>
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemLinqExpressionsVersion>4.3.0</SystemLinqExpressionsVersion>
Expand Down