mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mcs/class/System.Data/System.Data.SqlClient/SqlConnectionStringBuilder.cs
View File

@@ -26,7 +26,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_0
using System;
using System.Text;
using System.Collections;
@@ -40,9 +39,7 @@ using System.ComponentModel;
namespace System.Data.SqlClient
{
[DefaultPropertyAttribute ("DataSource")]
#if NET_2_0
[TypeConverterAttribute ("System.Data.SqlClient.SqlConnectionStringBuilder+SqlConnectionStringBuilderConverter, " + Consts.AssemblySystem_Data)]
#endif
public sealed class SqlConnectionStringBuilder : DbConnectionStringBuilder
{
@@ -230,13 +227,8 @@ namespace System.Data.SqlClient
}
}
#if NET_2_0
[Editor ("System.Windows.Forms.Design.FileNameEditor, " + Consts.AssemblySystem_Design,
"System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
#else
[Editor ("Microsoft.VSDesigner.Data.Design.DBParametersEditor, " + Consts.AssemblyMicrosoft_VSDesigner,
"System.Drawing.Design.UITypeEditor, " + Consts.AssemblySystem_Drawing)]
#endif
[DisplayNameAttribute ("AttachDbFilename")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public string AttachDBFilename {
@@ -279,9 +271,7 @@ namespace System.Data.SqlClient
[DisplayNameAttribute ("Data Source")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
#if NET_2_0
[TypeConverterAttribute ("System.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, " + Consts.AssemblySystem_Data)]
#endif
public string DataSource {
get { return _dataSource; }
set {
@@ -312,9 +302,7 @@ namespace System.Data.SqlClient
[DisplayNameAttribute ("Failover Partner")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
#if NET_2_0
[TypeConverterAttribute ("System.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, " + Consts.AssemblySystem_Data)]
#endif
public string FailoverPartner {
get { return _failoverPartner; }
set {
@@ -325,9 +313,7 @@ namespace System.Data.SqlClient
[DisplayNameAttribute ("Initial Catalog")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
#if NET_2_0
[TypeConverterAttribute ("System.Data.SqlClient.SqlConnectionStringBuilder+SqlInitialCatalogConverter, " + Consts.AssemblySystem_Data)]
#endif
public string InitialCatalog {
get { return _initialCatalog; }
set {
@@ -393,7 +379,7 @@ namespace System.Data.SqlClient
keys.Add("User Instance");
keys.Add("Context Connection");
keys.Add("Transaction Binding");
ReadOnlyCollection<string> coll = new ReadOnlyCollection<string>(keys);
var coll = new System.Collections.ObjectModel.ReadOnlyCollection<string>(keys);
return coll;
}
}
@@ -440,9 +426,7 @@ namespace System.Data.SqlClient
[DisplayNameAttribute ("Network Library")]
[RefreshPropertiesAttribute (RefreshProperties.All)]
#if NET_2_0
[TypeConverterAttribute ("System.Data.SqlClient.SqlConnectionStringBuilder+NetworkLibraryConverter, " + Consts.AssemblySystem_Data)]
#endif
public string NetworkLibrary {
get { return _networkLibrary; }
set {
@@ -544,7 +528,7 @@ namespace System.Data.SqlClient
values.Add(_userInstance);
values.Add(_contextConnection);
values.Add(_transactionBinding);
ReadOnlyCollection<object> coll = new ReadOnlyCollection<object>(values);
var coll = new System.Collections.ObjectModel.ReadOnlyCollection<object>(values);
return coll;
}
}
@@ -878,4 +862,3 @@ namespace System.Data.SqlClient
}
#endif // NET_2_0