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

Move into Shared for SqlInfoMessageEvent.cs #1311

Merged
merged 8 commits into from
Oct 18, 2021
Merged

Move into Shared for SqlInfoMessageEvent.cs #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff6458d
Move the netcore version of SqlInfoMessageEvent.cs to the shared src …
lcheunglci Oct 4, 2021
b1a5ed2
Fix compiler error due to the relative path change to the documentati…
lcheunglci Oct 4, 2021
94b898c
Add the comments for the MDAC codes back
lcheunglci Oct 5, 2021
4fc8343
Merge branch 'main' into MergeShared-SqlInfoMessageEvent
lcheunglci Oct 5, 2021
ad7a9ed
Apply suggestions from code review
lcheunglci Oct 5, 2021
ef8bd56
Resolve merge conflict due to the csproj
lcheunglci Oct 12, 2021
1ccf5eb
Resolve merge conflict due to csprojs
lcheunglci Oct 14, 2021
b0e3fa9
Resolve merge conflict in csprojs
lcheunglci Oct 16, 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
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 @@ -277,6 +277,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlException.cs">
<Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
Expand Down Expand Up @@ -562,7 +565,6 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
<Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalTransaction.cs" />
Expand Down
46 changes: 0 additions & 46 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
View file
Open in desktop

This file was deleted.

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 @@ -366,6 +366,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlException.cs">
<Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
Expand Down Expand Up @@ -551,7 +554,6 @@
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlError.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
Expand Down
47 changes: 0 additions & 47 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInfoMessageEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.Data.SqlClient
{
/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/SqlInfoMessageEventArgs/*' />
public sealed class SqlInfoMessageEventArgs : System.EventArgs
{
private readonly SqlException _exception;

internal SqlInfoMessageEventArgs(SqlException exception)
{
_exception = exception;
}

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/Errors/*' />
public SqlErrorCollection Errors => _exception.Errors;

// MDAC 65548
private bool ShouldSerializeErrors() => (null != _exception) && (0 < _exception.Errors.Count);

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/Message/*' />
public string Message => _exception.Message;

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/Source/*' />
// MDAC 68482
public string Source => _exception.Source;

/// <include file='../../../../../../doc/snippets/Microsoft.Data.SqlClient/SqlInfoMessageEventArgs.xml' path='docs/members[@name="SqlInfoMessageEventArgs"]/ToString/*' />
// MDAC 68482
override public string ToString() => Message;
}
}