Skip to content

Commit a1bfea8

Browse files
authored
NativeAOT | Remove DataSet.ReadXml, correct type name (#3369)
* Replace DataSet.ReadXml with custom deserialization This removes a reference to the built-in XML deserialization, which is slower and isn't trim-safe * Tighten validation of XML resource structure
1 parent e25b768 commit a1bfea8

File tree

9 files changed

+2685
-5121
lines changed

9 files changed

+2685
-5121
lines changed

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
10521052
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/DataSource/*'/>
10531053
[System.ComponentModel.DisplayNameAttribute("Data Source")]
10541054
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
1055-
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter")]
1055+
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, Microsoft.Data.SqlClient")]
10561056
public string DataSource { get { throw null; } set { } }
10571057
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/AttestationProtocol/*' />
10581058
[System.ComponentModel.DisplayNameAttribute("Attestation Protocol")]
@@ -1086,7 +1086,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
10861086
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/FailoverPartner/*'/>
10871087
[System.ComponentModel.DisplayNameAttribute("Failover Partner")]
10881088
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
1089-
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter")]
1089+
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, Microsoft.Data.SqlClient")]
10901090
public string FailoverPartner { get { throw null; } set { } }
10911091
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/FailoverPartnerSPN/*'/>
10921092
[System.ComponentModel.DisplayNameAttribute("Failover Partner SPN")]

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,8 +973,9 @@
973973
<Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
974974
<LogicalName>Microsoft.Data.SqlClient.Resources.%(Filename).resources</LogicalName>
975975
</EmbeddedResource>
976-
<EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
976+
<EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
977977
<LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
978+
<Link>Resources\Microsoft.Data.SqlClient.SqlMetaData.xml</Link>
978979
</EmbeddedResource>
979980
</ItemGroup>
980981

src/Microsoft.Data.SqlClient/netcore/src/Resources/Microsoft.Data.SqlClient.SqlMetaData.xml

Lines changed: 0 additions & 2539 deletions
This file was deleted.

src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
10381038
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/DataSource/*'/>
10391039
[System.ComponentModel.DisplayNameAttribute("Data Source")]
10401040
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
1041-
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter")]
1041+
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, Microsoft.Data.SqlClient")]
10421042
public string DataSource { get { throw null; } set { } }
10431043
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/EnclaveAttestationUrl/*'/>
10441044
[System.ComponentModel.DisplayNameAttribute("Enclave Attestation Url")]
@@ -1072,7 +1072,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
10721072
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/FailoverPartner/*'/>
10731073
[System.ComponentModel.DisplayNameAttribute("Failover Partner")]
10741074
[System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
1075-
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter")]
1075+
[System.ComponentModel.TypeConverter("Microsoft.Data.SqlClient.SqlConnectionStringBuilder+SqlDataSourceConverter, Microsoft.Data.SqlClient")]
10761076
public string FailoverPartner { get { throw null; } set { } }
10771077
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/FailoverPartnerSPN/*'/>
10781078
[System.ComponentModel.DisplayNameAttribute("Failover Partner SPN")]

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,9 @@
979979
<Link>Resources\%(RecursiveDir)%(Filename)%(Extension)</Link>
980980
<LogicalName>Microsoft.Data.SqlClient.Resources.%(Filename).resources</LogicalName>
981981
</EmbeddedResource>
982-
<EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
982+
<EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
983983
<LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
984+
<Link>Resources\Microsoft.Data.SqlClient.SqlMetaData.xml</Link>
984985
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
985986
</EmbeddedResource>
986987
</ItemGroup>

0 commit comments

Comments
 (0)