diff --git a/build.proj b/build.proj
index c470970f03..b65837479d 100644
--- a/build.proj
+++ b/build.proj
@@ -1,4 +1,4 @@
-
+
@@ -22,7 +22,7 @@
net9.0
netfx
netcore
- netfx
+ netfx
netcoreapp
$(TF)
$(TF)
@@ -39,7 +39,7 @@
DebugType=portable;DebugSymbols=true;IncludeSymbols=true;SymbolPackageFormat=snupkg;PublishRepositoryUrl=true;RepositoryUrl=https://github.com/dotnet/sqlclient;RepositoryType=git;EmbedUnTrackedSources=true;Deterministic=true;
-
+
$(NugetPackProperties);ContinuousIntegrationBuild=true;
@@ -51,15 +51,17 @@
-
+
+
+
-
+
@@ -69,7 +71,7 @@
-
+
@@ -78,12 +80,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -94,17 +96,17 @@
-
-
+
+
-
+
-
-
+
+
@@ -123,12 +125,12 @@
-
+
-
-
+
+
@@ -141,49 +143,55 @@
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
@@ -204,8 +212,8 @@
$(TestCommand.Replace($([System.Environment]::NewLine), " "))
-
-
+
+
@@ -227,12 +235,12 @@
$(TestCommand.Replace($([System.Environment]::NewLine), " "))
-
-
+
+
-
+
@@ -253,8 +261,8 @@
$(TestCommand.Replace($([System.Environment]::NewLine), " "))
-
-
+
+
@@ -276,8 +284,8 @@
$(TestCommand.Replace($([System.Environment]::NewLine), " "))
-
-
+
+
@@ -295,14 +303,14 @@
-
+
$(CI);TestTargetOS=$(TestOS)netfx;Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties)
-
+
$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;
@@ -314,7 +322,7 @@
-
+
$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;
@@ -324,22 +332,22 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
index bdbee92399..de8b52da12 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
@@ -111,7 +111,7 @@ public SqlJson(string jsonString) { }
///
public SqlJson(System.Text.Json.JsonDocument jsonDoc) { }
///
- public bool IsNull => throw null;
+ public bool IsNull => throw null;
///
public static SqlJson Null => throw null;
///
@@ -454,12 +454,14 @@ internal SqlClientFactory() { }
public override System.Data.Common.DbParameter CreateParameter() { throw null; }
///
public override System.Data.Common.DbDataSourceEnumerator CreateDataSourceEnumerator() { throw null; }
+#if NET
///
public override bool CanCreateBatch { get { throw null; } }
///
public override System.Data.Common.DbBatch CreateBatch() { throw null; }
///
public override System.Data.Common.DbBatchCommand CreateBatchCommand() { throw null; }
+#endif
}
///
public partial class SqlClientLogger
@@ -527,7 +529,7 @@ public enum SqlConnectionAttestationProtocol
///
HGS = 3
}
-
+
///
public enum SqlConnectionIPAddressPreference
{
@@ -1268,7 +1270,7 @@ internal SqlDataReader() { }
///
public override int RecordsAffected { get { throw null; } }
///
- public Microsoft.Data.SqlClient.DataClassification.SensitivityClassification SensitivityClassification { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public Microsoft.Data.SqlClient.DataClassification.SensitivityClassification SensitivityClassification { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
public override int VisibleFieldCount { get { throw null; } }
///
@@ -1495,7 +1497,9 @@ internal SqlException() { }
public byte State { get { throw null; } }
///
+#if NET
[System.Obsolete("This API supports obsolete formatter-based serialization. It should not be called or extended by application code.", DiagnosticId = "SYSLIB0051", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")]
+#endif
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo si, System.Runtime.Serialization.StreamingContext context) { }
///
public override string ToString() { throw null; }
@@ -1635,7 +1639,7 @@ public SqlParameter(string parameterName, object value) { }
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
public override System.Data.ParameterDirection Direction { get { throw null; } set { } }
///
- public bool ForceColumnEncryption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute]set { } }
+ public bool ForceColumnEncryption { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
///
[System.ComponentModel.DefaultValueAttribute(false)]
public override bool IsNullable { get { throw null; } set { } }
@@ -1827,11 +1831,19 @@ public override void Commit() { }
protected override void Dispose(bool disposing) { }
///
public override void Rollback() { }
+#if NET
///
public override void Rollback(string transactionName) { }
///
public override void Save(string savePointName) { }
+#else
+ ///
+ public void Rollback(string transactionName) { }
+
+ ///
+ public void Save(string savePointName) { }
+#endif
}
///
public sealed class SqlRetryingEventArgs : System.EventArgs
@@ -2674,7 +2686,7 @@ public partial class ColumnSensitivity
///
public ColumnSensitivity(System.Collections.Generic.IList sensitivityProperties) { }
///
- public System.Collections.ObjectModel.ReadOnlyCollection SensitivityProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public System.Collections.ObjectModel.ReadOnlyCollection SensitivityProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
///
public partial class InformationType
@@ -2682,9 +2694,9 @@ public partial class InformationType
///
public InformationType(string name, string id) { }
///
- public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
- public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
///
public partial class Label
@@ -2692,9 +2704,9 @@ public partial class Label
///
public Label(string name, string id) { }
///
- public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
- public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
///
public enum SensitivityRank
@@ -2718,11 +2730,11 @@ public partial class SensitivityClassification
///
public SensitivityClassification(System.Collections.Generic.IList labels, System.Collections.Generic.IList informationTypes, System.Collections.Generic.IList columnSensitivity, SensitivityRank sensitivityRank) { }
///
- public System.Collections.ObjectModel.ReadOnlyCollection ColumnSensitivities { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public System.Collections.ObjectModel.ReadOnlyCollection ColumnSensitivities { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
- public System.Collections.ObjectModel.ReadOnlyCollection InformationTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public System.Collections.ObjectModel.ReadOnlyCollection InformationTypes { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
- public System.Collections.ObjectModel.ReadOnlyCollection Labels { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public System.Collections.ObjectModel.ReadOnlyCollection Labels { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
public SensitivityRank SensitivityRank { get { throw null; } }
}
@@ -2732,9 +2744,9 @@ public partial class SensitivityProperty
///
public SensitivityProperty(Microsoft.Data.SqlClient.DataClassification.Label label, Microsoft.Data.SqlClient.DataClassification.InformationType informationType, SensitivityRank sensitivityRank) { }
///
- public Microsoft.Data.SqlClient.DataClassification.InformationType InformationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public Microsoft.Data.SqlClient.DataClassification.InformationType InformationType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
- public Microsoft.Data.SqlClient.DataClassification.Label Label { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
+ public Microsoft.Data.SqlClient.DataClassification.Label Label { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
///
public SensitivityRank SensitivityRank { get { throw null; } }
}
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index b587305bb5..fe15de2276 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -1,17 +1,20 @@
false
- net8.0;net9.0
+ net8.0;net9.0;netstandard2.0
$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\
+ netcoreapp
$(BinFolder)$(Configuration)\$(AssemblyName)\ref\
+
+ $(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)\netstandard\
$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml
Core $(BaseProduct)
Debug;Release;
- netcoreapp
AnyCPU;x64;x86
-
-
+
+
true
$(SigningKeyPath)
$(SigningKeyPath)
@@ -19,10 +22,12 @@
$(SigningKeyPath)
-
+
+
+
@@ -38,5 +43,8 @@
-
+
+
+
+
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 90f05cf0e2..803d13bc91 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -10,58 +10,69 @@
https://aka.ms/sqlclientproject
dotnet.png
README.md
-
+
The current data provider for SQL Server and Azure SQL databases. This has replaced System.Data.SqlClient. These classes provide access to SQL and encapsulate database-specific protocols, including tabular data stream (TDS).
-
-Commonly Used Types:
-Microsoft.Data.SqlClient.SqlConnection
-Microsoft.Data.SqlClient.SqlException
-Microsoft.Data.SqlClient.SqlParameter
-Microsoft.Data.SqlClient.SqlDataReader
-Microsoft.Data.SqlClient.SqlCommand
-Microsoft.Data.SqlClient.SqlTransaction
-Microsoft.Data.SqlClient.SqlParameterCollection
-Microsoft.Data.SqlClient.SqlClientFactory
-
-When using NuGet 3.x this package requires at least version 3.4.
+
+ Commonly Used Types:
+ Microsoft.Data.SqlClient.SqlConnection
+ Microsoft.Data.SqlClient.SqlException
+ Microsoft.Data.SqlClient.SqlParameter
+ Microsoft.Data.SqlClient.SqlDataReader
+ Microsoft.Data.SqlClient.SqlCommand
+ Microsoft.Data.SqlClient.SqlTransaction
+ Microsoft.Data.SqlClient.SqlParameterCollection
+ Microsoft.Data.SqlClient.SqlClientFactory
+
+ When using NuGet 3.x this package requires at least version 3.4.
https://go.microsoft.com/fwlink/?linkid=2090501
© Microsoft Corporation. All rights reserved.
sqlclient microsoft.data.sqlclient
-
+
+
+
+
-
-
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
@@ -70,16 +81,20 @@ When using NuGet 3.x this package requires at least version 3.4.
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
@@ -99,6 +114,10 @@ When using NuGet 3.x this package requires at least version 3.4.
+
+
+
+
@@ -123,13 +142,18 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+
-
-
+
+
+
+
+
+
+
@@ -143,7 +167,7 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+
@@ -159,7 +183,7 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+