Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -2,121 +2,129 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "src\System.Data.SqlClient.csproj", "{D4550556-4745-457F-BA8F-3EBF3836D6B4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Tests", "tests\FunctionalTests\System.Data.SqlClient.Tests.csproj", "{F3E72F35-0351-4D67-9388-725BCAD807BA}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.ManualTesting.Tests", "tests\ManualTests\System.Data.SqlClient.ManualTesting.Tests.csproj", "{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IMonitorLoader", "tests\StressTests\IMonitorLoader\IMonitorLoader.csproj", "{AF78BA88-6428-47EA-8682-442DAF8E9656}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient.Stress.Tests", "tests\StressTests\System.Data.SqlClient.Stress.Tests\System.Data.SqlClient.Stress.Tests.csproj", "{B94B8E6D-3E41-4046-B758-4A2E281F74EE}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressFramework", "tests\StressTests\System.Data.StressFramework\System.Data.StressFramework.csproj", "{518A4E22-0144-4699-80AE-757B744E8E38}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.StressRunner", "tests\StressTests\System.Data.StressRunner\System.Data.StressRunner.csproj", "{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.EndPoint", "tests\Tools\TDS\TDS.EndPoint\TDS.EndPoint.csproj", "{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS.Servers", "tests\Tools\TDS\TDS.Servers\TDS.Servers.csproj", "{978063D3-FBB5-4E10-8C45-67C90BE1B931}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TDS", "tests\Tools\TDS\TDS\TDS.csproj", "{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}"
ProjectSection(ProjectDependencies) = postProject
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {D4550556-4745-457F-BA8F-3EBF3836D6B4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "src\System.Data.SqlClient.csproj", "{D4550556-4745-457F-BA8F-3EBF3836D6B4}"
ProjectSection(ProjectDependencies) = postProject
{D58E8D2B-3331-4660-8DFB-512D66F8EC63} = {D58E8D2B-3331-4660-8DFB-512D66F8EC63}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Data.SqlClient", "ref\System.Data.SqlClient.csproj", "{D58E8D2B-3331-4660-8DFB-512D66F8EC63}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Unix_Debug|Any CPU = Unix_Debug|Any CPU
Unix_Release|Any CPU = Unix_Release|Any CPU
Windows_Debug|Any CPU = Windows_Debug|Any CPU
Windows_Release|Any CPU = Windows_Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.Build.0 = Unix_Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Unix_Debug|Any CPU.ActiveCfg = Unix_Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Unix_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Windows_Debug|Any CPU.ActiveCfg = Unix_Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Windows_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Unix_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Unix_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Unix_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Unix_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Unix_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Unix_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Unix_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Unix_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Unix_Debug|Any CPU.ActiveCfg = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Unix_Debug|Any CPU.Build.0 = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Unix_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Unix_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Unix_Debug|Any CPU.ActiveCfg = Unix_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Unix_Debug|Any CPU.Build.0 = Unix_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Unix_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Unix_Release|Any CPU.Build.0 = Unix_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Unix_Debug|Any CPU.ActiveCfg = Unix_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Unix_Debug|Any CPU.Build.0 = Unix_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Unix_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Unix_Release|Any CPU.Build.0 = Unix_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Unix_Debug|Any CPU.ActiveCfg = Unix_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Unix_Debug|Any CPU.Build.0 = Unix_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Unix_Release|Any CPU.ActiveCfg = Unix_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Unix_Release|Any CPU.Build.0 = Unix_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{F3E72F35-0351-4D67-9388-725BCAD807BA}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{AF78BA88-6428-47EA-8682-442DAF8E9656}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{B94B8E6D-3E41-4046-B758-4A2E281F74EE}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{518A4E22-0144-4699-80AE-757B744E8E38}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{518A4E22-0144-4699-80AE-757B744E8E38}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{529B187A-DE4F-4F4D-9FBB-D3D416FDB683}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{978063D3-FBB5-4E10-8C45-67C90BE1B931}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.ActiveCfg = netstandard-Windows_NT-Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Debug|Any CPU.Build.0 = netstandard-Windows_NT-Debug|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.ActiveCfg = netstandard-Windows_NT-Release|Any CPU
{D4550556-4745-457F-BA8F-3EBF3836D6B4}.Release|Any CPU.Build.0 = netstandard-Windows_NT-Release|Any CPU
{D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU
{D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU
{D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU
{D58E8D2B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F3E72F35-0351-4D67-9388-725BCAD807BA} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{B94B8E6D-3E41-4046-B758-4A2E281F74EE} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{978063D3-FBB5-4E10-8C45-67C90BE1B931} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9} = {ECE6CCAC-682B-4054-B737-E6DB4A4FA79A}
{F3E72F35-0351-4D67-9388-725BCAD807BA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{45DB5F86-7AE3-45C6-870D-F9357B66BDB5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{AF78BA88-6428-47EA-8682-442DAF8E9656} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{B94B8E6D-3E41-4046-B758-4A2E281F74EE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{518A4E22-0144-4699-80AE-757B744E8E38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{529B187A-DE4F-4F4D-9FBB-D3D416FDB683} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{1FF891B4-D3DE-4CCE-887C-CB48F5351A45} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{978063D3-FBB5-4E10-8C45-67C90BE1B931} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{8DC9D1A0-351B-47BC-A90F-B9DA542550E9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{D4550556-4745-457F-BA8F-3EBF3836D6B4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{D58E8D2B-3331-4660-8DFB-512D66F8EC63} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
EndGlobal

View File

@@ -3,6 +3,5 @@
<Import Project="..\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.1.2.0</AssemblyVersion>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
</Project>

View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Data.SqlClient.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>

View File

@@ -5,7 +5,7 @@
<ProjectReference Include="..\ref\System.Data.SqlClient.csproj">
<SupportedFramework>net463;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
</ProjectReference>
<ProjectReference Include="..\src\System.Data.SqlClient.builds" />
<ProjectReference Include="..\src\System.Data.SqlClient.csproj" />
</ItemGroup>
<ItemGroup>
<InboxOnTargetFramework Include="MonoAndroid10" />

View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<OutputType>Library</OutputType>
<NuGetTargetMoniker>.NETStandard,Version=v1.2</NuGetTargetMoniker>
</PropertyGroup>
<ItemGroup>
<None Include="project.json" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -2,8 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
netcoreapp;
uap;
netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -1,24 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
<PropertyGroup>
<ProjectGuid>{D58E8D2B-3331-4660-8DFB-512D66F8EC63}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="System.Data.SqlClient.cs" />
<Compile Include="System.Data.SqlClient.Manual.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.ComponentModel.Primitives\ref\System.ComponentModel.Primitives.csproj" />
<ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" />
<ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" />
<ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" />
<ProjectReference Include="..\..\System.IO\ref\System.IO.csproj" />
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
<ProjectReference Include="..\..\System.Threading.Tasks\ref\System.Threading.Tasks.csproj" />
<ProjectReference Include="..\..\System.Xml.ReaderWriter\ref\System.Xml.ReaderWriter.csproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -2,9 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
netcoreapp-Unix;
netcoreapp-Windows_NT;
net463-Windows_NT;
netstandard-Unix;
netstandard-Windows_NT;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -10,6 +10,7 @@ using System.Data.Common;
using System.Data.SqlClient;
using System.Data.SqlTypes;
using System.Diagnostics;
using System.Globalization;
namespace Microsoft.SqlServer.Server
{
@@ -592,7 +593,7 @@ namespace Microsoft.SqlServer.Server
maxLength,
precision,
scale,
Locale.GetCurrentCultureLcid(),
CultureInfo.CurrentCulture.LCID,
SmiMetaData.GetDefaultForType(colDbType).CompareOptions,
false, // no support for multi-valued columns in a TVP yet
null, // no support for structured columns yet

View File

@@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Data;
using System.Data.SqlTypes;
using System.Globalization;
namespace Microsoft.SqlServer.Server
{
@@ -132,7 +133,7 @@ namespace Microsoft.SqlServer.Server
DefaultNVarChar_NoCollation.MaxLength,
DefaultNVarChar_NoCollation.Precision,
DefaultNVarChar_NoCollation.Scale,
Locale.GetCurrentCultureLcid(),
CultureInfo.CurrentCulture.LCID,
SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth
);
}

View File

@@ -1,27 +1,27 @@
<!-- Not a bug. sni.dll is a native component that ships as part of the package. -->
sni.dll!GetSniMaxComposedSpnLength
sni.dll!SNIAddProviderWrapper
sni.dll!SNICheckConnectionWrapper
sni.dll!SNICloseWrapper
sni.dll!SNIGetLastError
sni.dll!SNIPacketRelease
sni.dll!SNIPacketResetWrapper
sni.dll!SNIQueryInfo
sni.dll!SNIReadAsyncWrapper
sni.dll!SNIReadSyncOverAsync
sni.dll!SNIRemoveProviderWrapper
sni.dll!SNISecInitPackage
sni.dll!SNISetInfoWrapper
sni.dll!SNITerminate
sni.dll!SNIWaitForSSLHandshakeToCompleteWrapper
sni.dll!UnmanagedIsTokenRestricted
sni.dll!GetSniMaxComposedSpnLength
sni.dll!SNIGetInfoWrapper
sni.dll!SNIGetLastError
sni.dll!SNIInitialize
sni.dll!SNIOpenSyncExWrapper
sni.dll!SNIOpenWrapper
sni.dll!SNIPacketAllocateWrapper
sni.dll!SNIPacketGetDataWrapper
sni.dll!SNIPacketRelease
sni.dll!SNIPacketResetWrapper
sni.dll!SNIPacketSetData
sni.dll!SNIQueryInfo
sni.dll!SNIReadAsyncWrapper
sni.dll!SNIReadSyncOverAsync
sni.dll!SNIRemoveProviderWrapper
sni.dll!SNISecGenClientContextWrapper
sni.dll!SNISecInitPackage
sni.dll!SNISetInfoWrapper
sni.dll!SNITerminate
sni.dll!SNIWaitForSSLHandshakeToCompleteWrapper
sni.dll!SNIWriteAsyncWrapper
sni.dll!SNIWriteSyncOverAsync
sni.dll!SNIWriteSyncOverAsync
sni.dll!UnmanagedIsTokenRestricted

View File

@@ -1,64 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
@@ -448,7 +389,10 @@
<value>A severe error occurred on the current command. The results, if any, should be discarded.</value>
</data>
<data name="SQL_SSPIGenerateError" xml:space="preserve">
<value>The target principal name is incorrect. Cannot generate SSPI context.</value>
<value>Failed to generate SSPI context.</value>
</data>
<data name="SQL_KerberosTicketMissingError" xml:space="preserve">
<value>Cannot access Kerberos ticket. Ensure Kerberos has been initialized with 'kinit'.</value>
</data>
<data name="SQL_InvalidSSPIPacketSize" xml:space="preserve">
<value>Invalid SSPI packet size.</value>
@@ -657,24 +601,9 @@
<data name="SqlMisc_FormatMessage" xml:space="preserve">
<value>The input wasn't in a correct format.</value>
</data>
<data name="SqlMisc_SqlTypeMessage" xml:space="preserve">
<value>SqlType error.</value>
</data>
<data name="SqlMisc_StreamErrorMessage" xml:space="preserve">
<value>An error occurred while reading.</value>
</data>
<data name="SqlMisc_NoBufferMessage" xml:space="preserve">
<value>There is no buffer. Read or write operation failed.</value>
</data>
<data name="SqlMisc_BufferInsufficientMessage" xml:space="preserve">
<value>The buffer is insufficient. Read or write operation failed.</value>
</data>
<data name="SqlMisc_WriteNonZeroOffsetOnNullMessage" xml:space="preserve">
<value>Cannot write to non-zero offset, because current value is Null.</value>
</data>
<data name="SqlMisc_WriteOffsetLargerThanLenMessage" xml:space="preserve">
<value>Cannot write from an offset that is larger than current length. It would leave uninitialized data in the buffer.</value>
</data>
<data name="SqlMisc_TruncationMaxDataMessage" xml:space="preserve">
<value>Data returned is larger than 2Gb in size. Use SequentialAccess command behavior in order to get all of the data.</value>
</data>
@@ -1059,4 +988,49 @@
<data name="AZURESQL_ChinaEndpoint" xml:space="preserve">
<value>.database.chinacloudapi.cn</value>
</data>
</root>
<data name="net_nego_channel_binding_not_supported" xml:space="preserve">
<value>No support for channel binding on operating systems other than Windows.</value>
</data>
<data name="net_gssapi_operation_failed_detailed" xml:space="preserve">
<value>GSSAPI operation failed with error - {0} ({1}).</value>
</data>
<data name="net_gssapi_operation_failed" xml:space="preserve">
<value>GSSAPI operation failed with status: {0} (Minor status: {1}).</value>
</data>
<data name="net_ntlm_not_possible_default_cred" xml:space="preserve">
<value>NTLM authentication is not possible with default credentials on this platform.</value>
</data>
<data name="net_nego_not_supported_empty_target_with_defaultcreds" xml:space="preserve">
<value>Target name should be non-empty if default credentials are passed.</value>
</data>
<data name="net_nego_server_not_supported" xml:space="preserve">
<value>Server implementation is not supported.</value>
</data>
<data name="net_nego_protection_level_not_supported" xml:space="preserve">
<value>Requested protection level is not supported with the GSSAPI implementation currently installed.</value>
</data>
<data name="net_context_buffer_too_small" xml:space="preserve">
<value>Insufficient buffer space. Required: {0} Actual: {1}.</value>
</data>
<data name="net_auth_message_not_encrypted" xml:space="preserve">
<value>Protocol error: A received message contains a valid signature but it was not encrypted as required by the effective Protection Level.</value>
</data>
<data name="net_securitypackagesupport" xml:space="preserve">
<value>The requested security package is not supported.</value>
</data>
<data name="net_log_operation_failed_with_error" xml:space="preserve">
<value>{0} failed with error {1}.</value>
</data>
<data name="net_MethodNotImplementedException" xml:space="preserve">
<value>This method is not implemented by this class.</value>
</data>
<data name="event_OperationReturnedSomething" xml:space="preserve">
<value>{0} returned {1}.</value>
</data>
<data name="net_invalid_enum" xml:space="preserve">
<value>The specified value is not valid in the '{0}' enumeration.</value>
</data>
<data name="SSPIInvalidHandleType" xml:space="preserve">
<value>'{0}' is not a supported handle type.</value>
</data>
</root>

View File

@@ -6,16 +6,13 @@
<AssemblyName>System.Data.SqlClient</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net463'">true</IsPartialFacadeAssembly>
<!-- Although we have a NS configuration, we know we use API that's not currently whitelisted: just validate against OneCore -->
<UWPCompatible>false</UWPCompatible>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetsWindows)' != 'true' ">
<DefineConstants>$(DefineConstants);MANAGED_SNI</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='net463-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="System.Data.SqlClient.TypeForwards.cs" />
<Compile Include="Microsoft\SqlServer\Server\ITypedGetters.cs" />
@@ -123,24 +120,9 @@
<Compile Include="System\Data\SqlTypes\SqlTypeWorkarounds.cs" />
<Compile Include="System\Data\SqlTypes\SQLResource.cs" />
<Compile Include="$(CommonPath)\System\NotImplemented.cs" />
<Compile Include="$(CommonPath)\System\Data\Locale\Locale.cs">
<Link>System\Data\Locale\Locale.cs</Link>
<Compile Include="$(CommonPath)\System\Threading\Tasks\TaskToApm.cs">
<Link>Common\System\Threading\Tasks\TaskToApm.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(IsPartialFacadeAssembly)' != 'true' ">
<Compile Include="$(CommonPath)\System\Data\Locale\LocaleMapper.Windows.cs">
<Link>System\Data\Locale\LocaleMapper.Windows.cs</Link>
</Compile>
<Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
<Compile Include="Interop\SNINativeMethodWrapper.Windows.cs" />
<Compile Include="System\Data\SqlClient\TdsParserSafeHandles.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' ">
<Compile Include="$(CommonPath)\System\Data\Locale\LocaleMapper.Unix.cs">
<Link>System\Data\Locale\LocaleMapper.Unix.cs</Link>
</Compile>
<Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
<Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNIError.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNIHandle.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNILoadHandle.cs" />
@@ -154,10 +136,190 @@
<Compile Include="System\Data\SqlClient\SNI\SNITcpHandle.cs" />
<Compile Include="System\Data\SqlClient\SNI\SslOverTdsStream.cs" />
<Compile Include="System\Data\SqlClient\SNI\SNICommon.cs" />
<Compile Include="System\Data\SqlClient\SNI\SspiClientContextStatus.cs" />
<Compile Include="System\Data\SqlClient\TdsParserStateObjectManaged.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(IsPartialFacadeAssembly)' != 'true' ">
<Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
<Compile Include="Interop\SNINativeMethodWrapper.Windows.cs" />
<Compile Include="System\Data\SqlClient\TdsParserSafeHandles.cs" />
<Compile Include="System\Data\SqlClient\TdsParserStateObjectNative.cs" />
<Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs" />
<Compile Include="System\Data\SqlClient\TdsParser.Windows.cs" />
<Compile Include="System\Data\SqlClient\LocalDBAPI.Windows.cs" />
</ItemGroup>
<!-- Windows dependencies for Integrated Authentication for MANAGED_SNI build -->
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' And '$(IsPartialFacadeAssembly)' != 'true' ">
<Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Windows.cs">
<Link>Common\System\Net\Security\NegotiateStreamPal.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SafeDeleteContext.cs">
<Link>Common\Interop\Windows\sspicliSafeDeleteContext.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecuritySafeHandles.cs">
<Link>Common\Interop\Windows\sspicli\SecuritySafeHandles.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\Interop.SSPI.cs">
<Link>Common\Interop\Windows\sspicli\Interop.SSPI.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\SecurityContextTokenHandle.cs">
<Link>Common\System\Net\Security\SecurityContextTokenHandle.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs">
<Link>Common\Interop\Windows\SChannel\Interop.SECURITY_STATUS.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Bindings.cs">
<Link>Common\Interop\Windows\sspicli\SecPkgContext_Bindings.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs">
<Link>Common\System\Net\DebugCriticalHandleZeroOrMinusOneIsInvalid.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\NetEventSource.Security.cs">
<Link>Common\System\Net\Security\NetEventSource.Security.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.CloseHandle.cs">
<Link>Common\Interop\Windows\kernel32\Interop.CloseHandle.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\GlobalSSPI.cs">
<Link>Common\Interop\Windows\sspicli\GlobalSSPI.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIInterface.cs">
<Link>Common\Interop\Windows\sspicli\SSPIInterface.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfoClass.cs">
<Link>Common\Interop\Windows\sspicli\SecurityPackageInfoClass.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecurityPackageInfo.cs">
<Link>Common\Interop\Windows\sspicli\SecurityPackageInfo.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\IntPtrHelper.cs">
<Link>Common\System\Net\IntPtrHelper.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIAuthType.cs">
<Link>Common\Interop\Windows\sspicli\SSPIAuthType.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPISecureChannelType.cs">
<Link>Common\Interop\Windows\sspicli\SSPISecureChannelType.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SSPIWrapper.cs">
<Link>Common\Interop\Windows\sspicli\SSPIWrapper.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\NetEventSource.Security.Windows.cs">
<Link>Common\System\Net\Security\NetEventSource.Security.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_Sizes.cs">
<Link>Common\Interop\Windows\sspicli\SecPkgContext_Sizes.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs">
<Link>Common\Interop\Windows\sspicli\SecPkgContext_StreamSizes.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs">
<Link>Common\Interop\Windows\sspicli\SecPkgContext_NegotiationInfoW.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs">
<Link>Common\Interop\Windows\SChannel\SecPkgContext_ConnectionInfo.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\sspicli\NegotiationInfoClass.cs">
<Link>Common\Interop\Windows\sspicli\NegotiationInfoClass.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates.cs">
<Link>Common\Interop\Windows\Crypt32\Interop.certificates.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Windows\Crypt32\Interop.certificates_types.cs">
<Link>Common\Interop\Windows\Crypt32\Interop.certificates_types.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\ContextFlagsAdapterPal.Windows.cs">
<Link>Common\System\Net\ContextFlagsAdapterPal.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\SecurityStatusAdapterPal.Windows.cs">
<Link>Common\System\Net\SecurityStatusAdapterPal.Windows.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Collections\Generic\BidirectionalDictionary.cs">
<Link>Common\System\Collections\Generic\BidirectionalDictionary.cs</Link>
</Compile>
</ItemGroup>
<!-- Common (Windows and Unix) dependencies for MANAGED_SNI build -->
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' != 'true'">
<Compile Include="$(CommonPath)\System\Net\ContextFlagsPal.cs">
<Link>Common\System\Net\ContextFlagsPal.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\SecurityStatusPal.cs">
<Link>Common\System\Net\SecurityStatusPal.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\SecurityBufferType.cs">
<Link>Common\System\Net\Security\SecurityBufferType.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\SecurityBuffer.cs">
<Link>Common\System\Net\Security\SecurityBuffer.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\DebugSafeHandle.cs">
<Link>Common\System\Net\DebugSafeHandle.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs">
<Link>Common\System\Net\DebugCriticalHandleMinusOneIsInvalid.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Logging\NetEventSource.Common.cs">
<Link>Common\System\Net\Logging\NetEventSource.Common.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Logging\DebugThreadTracking.cs">
<Link>Common\System\Net\Logging\DebugThreadTracking.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\InternalException.cs">
<Link>Common\System\Net\InternalException.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\NegotiationInfoClass.cs">
<Link>Common\System\Net\NegotiationInfoClass.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup Condition=" '$(TargetsWindows)' != 'true' And '$(IsPartialFacadeAssembly)' != 'true' ">
<Compile Include="System\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs" />
<Compile Include="Interop\SNINativeMethodWrapper.Unix.cs" />
<Compile Include="$(CommonPath)\System\Net\Security\NegotiateStreamPal.Unix.cs">
<Link>Common\System\Net\Security\NegotiateStreamPal.Unix.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\Unix\SafeDeleteContext.cs">
<Link>Common\System\Net\Security\Unix\SafeDeleteContext.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\Unix\SafeFreeCredentials.cs">
<Link>Common\System\Net\Security\Unix\SafeFreeCredentials.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
<Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
<Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\Unix\SafeFreeNegoCredentials.cs">
<Link>Common\System\Net\Security\Unix\SafeFreeNegoCredentials.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs">
<Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\Security\Unix\SafeDeleteNegoContext.cs">
<Link>Common\System\Net\Security\Unix\SafeDeleteNegoContext.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs">
<Link>Common\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs</Link>
</Compile>
<Compile Include="$(CommonPath)\System\Net\ContextFlagsAdapterPal.Unix.cs">
<Link>Common\System\Net\ContextFlagsAdapterPal.Unix.cs</Link>
</Compile>
<Compile Include="System\Data\SqlClient\TdsParserStateObjectFactory.Unix.cs" />
<Compile Include="System\Data\SqlClient\TdsParser.Unix.cs" />
<Compile Include="System\Data\SqlClient\LocalDBAPI.Unix.cs" />
</ItemGroup>
<ItemGroup Condition="'$(IsPartialFacadeAssembly)' == 'true'">
<TargetingPackReference Include="mscorlib" />
<TargetingPackReference Include="System.Data" />
<Reference Include="mscorlib" />
<Reference Include="System.Data" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Win32.Primitives" />
@@ -186,16 +348,14 @@
<Reference Include="System.Threading.ThreadPool" />
<Reference Include="System.Threading.Timer" />
<Reference Include="System.Xml.ReaderWriter" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Reference Include="System.IO.Pipes" />
<Reference Include="System.Security.Principal" />
<Reference Include="System.Security.Cryptography.X509Certificates" />
<Reference Include="System.Net.Sockets" />
<Reference Include="System.Net.Security" />
<Reference Include="System.Net.Primitives" />
<Reference Include="System.Net.NameResolution" />
<Reference Include="System.Diagnostics.Tracing" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<Import Project=".\GenerateThisAssemblyCs.targets" Condition="'$(IsPartialFacadeAssembly)' != 'true'" />
</Project>
</Project>

View File

@@ -13,7 +13,6 @@ using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using Res = System.SR;
namespace System
{
@@ -193,7 +192,7 @@ namespace System.Data.Common
internal static PlatformNotSupportedException DbTypeNotSupported(string dbType)
{
PlatformNotSupportedException e = new PlatformNotSupportedException(Res.GetString(Res.SQL_DbTypeNotSupportedOnThisPlatform, dbType));
PlatformNotSupportedException e = new PlatformNotSupportedException(SR.GetString(SR.SQL_DbTypeNotSupportedOnThisPlatform, dbType));
return e;
}
internal static InvalidCastException InvalidCast()
@@ -227,26 +226,26 @@ namespace System.Data.Common
internal static InvalidOperationException MethodCalledTwice(string method)
{
InvalidOperationException e = new InvalidOperationException(Res.GetString(Res.ADP_CalledTwice, method));
InvalidOperationException e = new InvalidOperationException(SR.GetString(SR.ADP_CalledTwice, method));
return e;
}
internal static ArgumentException InvalidMultipartName(string property, string value)
{
ArgumentException e = new ArgumentException(Res.GetString(Res.ADP_InvalidMultipartName, Res.GetString(property), value));
ArgumentException e = new ArgumentException(SR.GetString(SR.ADP_InvalidMultipartName, SR.GetString(property), value));
return e;
}
internal static ArgumentException InvalidMultipartNameIncorrectUsageOfQuotes(string property, string value)
{
ArgumentException e = new ArgumentException(Res.GetString(Res.ADP_InvalidMultipartNameQuoteUsage, Res.GetString(property), value));
ArgumentException e = new ArgumentException(SR.GetString(SR.ADP_InvalidMultipartNameQuoteUsage, SR.GetString(property), value));
return e;
}
internal static ArgumentException InvalidMultipartNameToManyParts(string property, string value, int limit)
{
ArgumentException e = new ArgumentException(Res.GetString(Res.ADP_InvalidMultipartNameToManyParts, Res.GetString(property), value, limit));
ArgumentException e = new ArgumentException(SR.GetString(SR.ADP_InvalidMultipartNameToManyParts, SR.GetString(property), value, limit));
return e;
}
@@ -285,7 +284,7 @@ namespace System.Data.Common
internal static ArgumentOutOfRangeException InvalidEnumerationValue(Type type, int value)
{
return ADP.ArgumentOutOfRange(Res.GetString(Res.ADP_InvalidEnumerationValue, type.Name, value.ToString(System.Globalization.CultureInfo.InvariantCulture)), type.Name);
return ADP.ArgumentOutOfRange(SR.GetString(SR.ADP_InvalidEnumerationValue, type.Name, value.ToString(System.Globalization.CultureInfo.InvariantCulture)), type.Name);
}
@@ -368,19 +367,19 @@ namespace System.Data.Common
//
internal static ArgumentException ConnectionStringSyntax(int index)
{
return Argument(Res.GetString(Res.ADP_ConnectionStringSyntax, index));
return Argument(SR.GetString(SR.ADP_ConnectionStringSyntax, index));
}
internal static ArgumentException KeywordNotSupported(string keyword)
{
return Argument(Res.GetString(Res.ADP_KeywordNotSupported, keyword));
return Argument(SR.GetString(SR.ADP_KeywordNotSupported, keyword));
}
internal static ArgumentException InvalidMinMaxPoolSizeValues()
{
return ADP.Argument(Res.GetString(Res.ADP_InvalidMinMaxPoolSizeValues));
return ADP.Argument(SR.GetString(SR.ADP_InvalidMinMaxPoolSizeValues));
}
internal static ArgumentException ConvertFailed(Type fromType, Type toType, Exception innerException)
{
return ADP.Argument(Res.GetString(Res.SqlConvert_ConvertFailed, fromType.FullName, toType.FullName), innerException);
return ADP.Argument(SR.GetString(SR.SqlConvert_ConvertFailed, fromType.FullName, toType.FullName), innerException);
}
@@ -389,7 +388,7 @@ namespace System.Data.Common
//
internal static InvalidOperationException NoConnectionString()
{
return InvalidOperation(Res.GetString(Res.ADP_NoConnectionString));
return InvalidOperation(SR.GetString(SR.ADP_NoConnectionString));
}
internal static Exception MethodNotImplemented([CallerMemberName] string methodName = "")
@@ -403,17 +402,17 @@ namespace System.Data.Common
{
case (ConnectionState.Closed):
case (ConnectionState.Connecting | ConnectionState.Broken):
return Res.GetString(Res.ADP_ConnectionStateMsg_Closed);
return SR.GetString(SR.ADP_ConnectionStateMsg_Closed);
case (ConnectionState.Connecting):
return Res.GetString(Res.ADP_ConnectionStateMsg_Connecting);
return SR.GetString(SR.ADP_ConnectionStateMsg_Connecting);
case (ConnectionState.Open):
return Res.GetString(Res.ADP_ConnectionStateMsg_Open);
return SR.GetString(SR.ADP_ConnectionStateMsg_Open);
case (ConnectionState.Open | ConnectionState.Executing):
return Res.GetString(Res.ADP_ConnectionStateMsg_OpenExecuting);
return SR.GetString(SR.ADP_ConnectionStateMsg_OpenExecuting);
case (ConnectionState.Open | ConnectionState.Fetching):
return Res.GetString(Res.ADP_ConnectionStateMsg_OpenFetching);
return SR.GetString(SR.ADP_ConnectionStateMsg_OpenFetching);
default:
return Res.GetString(Res.ADP_ConnectionStateMsg, state.ToString());
return SR.GetString(SR.ADP_ConnectionStateMsg, state.ToString());
}
}
@@ -427,21 +426,21 @@ namespace System.Data.Common
}
internal static Exception InvalidConnectionOptionValueLength(string key, int limit)
{
return Argument(Res.GetString(Res.ADP_InvalidConnectionOptionValueLength, key, limit));
return Argument(SR.GetString(SR.ADP_InvalidConnectionOptionValueLength, key, limit));
}
internal static Exception InvalidConnectionOptionValue(string key, Exception inner)
{
return Argument(Res.GetString(Res.ADP_InvalidConnectionOptionValue, key), inner);
return Argument(SR.GetString(SR.ADP_InvalidConnectionOptionValue, key), inner);
}
internal static Exception MissingConnectionOptionValue(string key, string requiredAdditionalKey)
{
return Argument(Res.GetString(Res.ADP_MissingConnectionOptionValue, key, requiredAdditionalKey));
return Argument(SR.GetString(SR.ADP_MissingConnectionOptionValue, key, requiredAdditionalKey));
}
internal static Exception WrongType(Type got, Type expected)
{
return Argument(Res.GetString(Res.SQL_WrongType, got.ToString(), expected.ToString()));
return Argument(SR.GetString(SR.SQL_WrongType, got.ToString(), expected.ToString()));
}
@@ -450,12 +449,12 @@ namespace System.Data.Common
//
internal static Exception PooledOpenTimeout()
{
return ADP.InvalidOperation(Res.GetString(Res.ADP_PooledOpenTimeout));
return ADP.InvalidOperation(SR.GetString(SR.ADP_PooledOpenTimeout));
}
internal static Exception NonPooledOpenTimeout()
{
return ADP.TimeoutException(Res.GetString(Res.ADP_NonPooledOpenTimeout));
return ADP.TimeoutException(SR.GetString(SR.ADP_NonPooledOpenTimeout));
}
//
@@ -463,31 +462,31 @@ namespace System.Data.Common
//
internal static ArgumentException CollectionRemoveInvalidObject(Type itemType, ICollection collection)
{
return Argument(Res.GetString(Res.ADP_CollectionRemoveInvalidObject, itemType.Name, collection.GetType().Name));
return Argument(SR.GetString(SR.ADP_CollectionRemoveInvalidObject, itemType.Name, collection.GetType().Name));
}
internal static ArgumentNullException CollectionNullValue(string parameter, Type collection, Type itemType)
{
return ArgumentNull(parameter, Res.GetString(Res.ADP_CollectionNullValue, collection.Name, itemType.Name));
return ArgumentNull(parameter, SR.GetString(SR.ADP_CollectionNullValue, collection.Name, itemType.Name));
}
internal static IndexOutOfRangeException CollectionIndexInt32(int index, Type collection, int count)
{
return IndexOutOfRange(Res.GetString(Res.ADP_CollectionIndexInt32, index.ToString(CultureInfo.InvariantCulture), collection.Name, count.ToString(CultureInfo.InvariantCulture)));
return IndexOutOfRange(SR.GetString(SR.ADP_CollectionIndexInt32, index.ToString(CultureInfo.InvariantCulture), collection.Name, count.ToString(CultureInfo.InvariantCulture)));
}
internal static IndexOutOfRangeException CollectionIndexString(Type itemType, string propertyName, string propertyValue, Type collection)
{
return IndexOutOfRange(Res.GetString(Res.ADP_CollectionIndexString, itemType.Name, propertyName, propertyValue, collection.Name));
return IndexOutOfRange(SR.GetString(SR.ADP_CollectionIndexString, itemType.Name, propertyName, propertyValue, collection.Name));
}
internal static InvalidCastException CollectionInvalidType(Type collection, Type itemType, object invalidValue)
{
return InvalidCast(Res.GetString(Res.ADP_CollectionInvalidType, collection.Name, itemType.Name, invalidValue.GetType().Name));
return InvalidCast(SR.GetString(SR.ADP_CollectionInvalidType, collection.Name, itemType.Name, invalidValue.GetType().Name));
}
internal static ArgumentException ParametersIsNotParent(Type parameterType, ICollection collection)
{
return Argument(Res.GetString(Res.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name));
return Argument(SR.GetString(SR.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name));
}
internal static ArgumentException ParametersIsParent(Type parameterType, ICollection collection)
{
return Argument(Res.GetString(Res.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name));
return Argument(SR.GetString(SR.ADP_CollectionIsNotParent, parameterType.Name, collection.GetType().Name));
}
//
@@ -495,26 +494,26 @@ namespace System.Data.Common
//
internal static InvalidOperationException TransactionConnectionMismatch()
{
return Provider(Res.GetString(Res.ADP_TransactionConnectionMismatch));
return Provider(SR.GetString(SR.ADP_TransactionConnectionMismatch));
}
internal static InvalidOperationException TransactionRequired(string method)
{
return Provider(Res.GetString(Res.ADP_TransactionRequired, method));
return Provider(SR.GetString(SR.ADP_TransactionRequired, method));
}
internal static Exception CommandTextRequired(string method)
{
return InvalidOperation(Res.GetString(Res.ADP_CommandTextRequired, method));
return InvalidOperation(SR.GetString(SR.ADP_CommandTextRequired, method));
}
internal static InvalidOperationException ConnectionRequired(string method)
{
return InvalidOperation(Res.GetString(Res.ADP_ConnectionRequired, method));
return InvalidOperation(SR.GetString(SR.ADP_ConnectionRequired, method));
}
internal static InvalidOperationException OpenConnectionRequired(string method, ConnectionState state)
{
return InvalidOperation(Res.GetString(Res.ADP_OpenConnectionRequired, method, ADP.ConnectionStateMsg(state)));
return InvalidOperation(SR.GetString(SR.ADP_OpenConnectionRequired, method, ADP.ConnectionStateMsg(state)));
}
internal static Exception OpenReaderExists()
@@ -524,7 +523,7 @@ namespace System.Data.Common
internal static Exception OpenReaderExists(Exception e)
{
return InvalidOperation(Res.GetString(Res.ADP_OpenReaderExists), e);
return InvalidOperation(SR.GetString(SR.ADP_OpenReaderExists), e);
}
@@ -533,18 +532,18 @@ namespace System.Data.Common
//
internal static Exception NonSeqByteAccess(long badIndex, long currIndex, string method)
{
return InvalidOperation(Res.GetString(Res.ADP_NonSeqByteAccess, badIndex.ToString(CultureInfo.InvariantCulture), currIndex.ToString(CultureInfo.InvariantCulture), method));
return InvalidOperation(SR.GetString(SR.ADP_NonSeqByteAccess, badIndex.ToString(CultureInfo.InvariantCulture), currIndex.ToString(CultureInfo.InvariantCulture), method));
}
internal static Exception NegativeParameter(string parameterName)
{
return InvalidOperation(Res.GetString(Res.ADP_NegativeParameter, parameterName));
return InvalidOperation(SR.GetString(SR.ADP_NegativeParameter, parameterName));
}
internal static Exception InvalidSeekOrigin(string parameterName)
{
return ArgumentOutOfRange(Res.GetString(Res.ADP_InvalidSeekOrigin), parameterName);
return ArgumentOutOfRange(SR.GetString(SR.ADP_InvalidSeekOrigin), parameterName);
}
//
@@ -552,12 +551,12 @@ namespace System.Data.Common
//
internal static Exception InvalidMetaDataValue()
{
return ADP.Argument(Res.GetString(Res.ADP_InvalidMetaDataValue));
return ADP.Argument(SR.GetString(SR.ADP_InvalidMetaDataValue));
}
internal static InvalidOperationException NonSequentialColumnAccess(int badCol, int currCol)
{
return InvalidOperation(Res.GetString(Res.ADP_NonSequentialColumnAccess, badCol.ToString(CultureInfo.InvariantCulture), currCol.ToString(CultureInfo.InvariantCulture)));
return InvalidOperation(SR.GetString(SR.ADP_NonSequentialColumnAccess, badCol.ToString(CultureInfo.InvariantCulture), currCol.ToString(CultureInfo.InvariantCulture)));
}
@@ -566,27 +565,27 @@ namespace System.Data.Common
//
internal static Exception InvalidCommandTimeout(int value, [CallerMemberName] string property = "")
{
return Argument(Res.GetString(Res.ADP_InvalidCommandTimeout, value.ToString(CultureInfo.InvariantCulture)), property);
return Argument(SR.GetString(SR.ADP_InvalidCommandTimeout, value.ToString(CultureInfo.InvariantCulture)), property);
}
internal static Exception UninitializedParameterSize(int index, Type dataType)
{
return InvalidOperation(Res.GetString(Res.ADP_UninitializedParameterSize, index.ToString(CultureInfo.InvariantCulture), dataType.Name));
return InvalidOperation(SR.GetString(SR.ADP_UninitializedParameterSize, index.ToString(CultureInfo.InvariantCulture), dataType.Name));
}
internal static Exception PrepareParameterType(DbCommand cmd)
{
return InvalidOperation(Res.GetString(Res.ADP_PrepareParameterType, cmd.GetType().Name));
return InvalidOperation(SR.GetString(SR.ADP_PrepareParameterType, cmd.GetType().Name));
}
internal static Exception PrepareParameterSize(DbCommand cmd)
{
return InvalidOperation(Res.GetString(Res.ADP_PrepareParameterSize, cmd.GetType().Name));
return InvalidOperation(SR.GetString(SR.ADP_PrepareParameterSize, cmd.GetType().Name));
}
internal static Exception PrepareParameterScale(DbCommand cmd, string type)
{
return InvalidOperation(Res.GetString(Res.ADP_PrepareParameterScale, cmd.GetType().Name, type));
return InvalidOperation(SR.GetString(SR.ADP_PrepareParameterScale, cmd.GetType().Name, type));
}
internal static Exception MismatchedAsyncResult(string expectedMethod, string gotMethod)
{
return InvalidOperation(Res.GetString(Res.ADP_MismatchedAsyncResult, expectedMethod, gotMethod));
return InvalidOperation(SR.GetString(SR.ADP_MismatchedAsyncResult, expectedMethod, gotMethod));
}
//
@@ -594,23 +593,23 @@ namespace System.Data.Common
//
internal static Exception ConnectionIsDisabled(Exception InnerException)
{
return InvalidOperation(Res.GetString(Res.ADP_ConnectionIsDisabled), InnerException);
return InvalidOperation(SR.GetString(SR.ADP_ConnectionIsDisabled), InnerException);
}
internal static Exception ClosedConnectionError()
{
return InvalidOperation(Res.GetString(Res.ADP_ClosedConnectionError));
return InvalidOperation(SR.GetString(SR.ADP_ClosedConnectionError));
}
internal static Exception ConnectionAlreadyOpen(ConnectionState state)
{
return InvalidOperation(Res.GetString(Res.ADP_ConnectionAlreadyOpen, ADP.ConnectionStateMsg(state)));
return InvalidOperation(SR.GetString(SR.ADP_ConnectionAlreadyOpen, ADP.ConnectionStateMsg(state)));
}
internal static Exception OpenConnectionPropertySet(string property, ConnectionState state)
{
return InvalidOperation(Res.GetString(Res.ADP_OpenConnectionPropertySet, property, ADP.ConnectionStateMsg(state)));
return InvalidOperation(SR.GetString(SR.ADP_OpenConnectionPropertySet, property, ADP.ConnectionStateMsg(state)));
}
internal static Exception EmptyDatabaseName()
{
return Argument(Res.GetString(Res.ADP_EmptyDatabaseName));
return Argument(SR.GetString(SR.ADP_EmptyDatabaseName));
}
internal enum ConnectionError
@@ -622,7 +621,7 @@ namespace System.Data.Common
}
internal static Exception InternalConnectionError(ConnectionError internalError)
{
return InvalidOperation(Res.GetString(Res.ADP_InternalConnectionError, (int)internalError));
return InvalidOperation(SR.GetString(SR.ADP_InternalConnectionError, (int)internalError));
}
internal enum InternalErrorCode
@@ -666,17 +665,17 @@ namespace System.Data.Common
}
internal static Exception InternalError(InternalErrorCode internalError)
{
return InvalidOperation(Res.GetString(Res.ADP_InternalProviderError, (int)internalError));
return InvalidOperation(SR.GetString(SR.ADP_InternalProviderError, (int)internalError));
}
internal static Exception InvalidConnectRetryCountValue()
{
return Argument(Res.GetString(Res.SQLCR_InvalidConnectRetryCountValue));
return Argument(SR.GetString(SR.SQLCR_InvalidConnectRetryCountValue));
}
internal static Exception InvalidConnectRetryIntervalValue()
{
return Argument(Res.GetString(Res.SQLCR_InvalidConnectRetryIntervalValue));
return Argument(SR.GetString(SR.SQLCR_InvalidConnectRetryIntervalValue));
}
//
@@ -684,27 +683,27 @@ namespace System.Data.Common
//
internal static Exception DataReaderClosed([CallerMemberName] string method = "")
{
return InvalidOperation(Res.GetString(Res.ADP_DataReaderClosed, method));
return InvalidOperation(SR.GetString(SR.ADP_DataReaderClosed, method));
}
internal static ArgumentOutOfRangeException InvalidSourceBufferIndex(int maxLen, long srcOffset, string parameterName)
{
return ArgumentOutOfRange(Res.GetString(Res.ADP_InvalidSourceBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), srcOffset.ToString(CultureInfo.InvariantCulture)), parameterName);
return ArgumentOutOfRange(SR.GetString(SR.ADP_InvalidSourceBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), srcOffset.ToString(CultureInfo.InvariantCulture)), parameterName);
}
internal static ArgumentOutOfRangeException InvalidDestinationBufferIndex(int maxLen, int dstOffset, string parameterName)
{
return ArgumentOutOfRange(Res.GetString(Res.ADP_InvalidDestinationBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), dstOffset.ToString(CultureInfo.InvariantCulture)), parameterName);
return ArgumentOutOfRange(SR.GetString(SR.ADP_InvalidDestinationBufferIndex, maxLen.ToString(CultureInfo.InvariantCulture), dstOffset.ToString(CultureInfo.InvariantCulture)), parameterName);
}
internal static IndexOutOfRangeException InvalidBufferSizeOrIndex(int numBytes, int bufferIndex)
{
return IndexOutOfRange(Res.GetString(Res.SQL_InvalidBufferSizeOrIndex, numBytes.ToString(CultureInfo.InvariantCulture), bufferIndex.ToString(CultureInfo.InvariantCulture)));
return IndexOutOfRange(SR.GetString(SR.SQL_InvalidBufferSizeOrIndex, numBytes.ToString(CultureInfo.InvariantCulture), bufferIndex.ToString(CultureInfo.InvariantCulture)));
}
internal static Exception InvalidDataLength(long length)
{
return IndexOutOfRange(Res.GetString(Res.SQL_InvalidDataLength, length.ToString(CultureInfo.InvariantCulture)));
return IndexOutOfRange(SR.GetString(SR.SQL_InvalidDataLength, length.ToString(CultureInfo.InvariantCulture)));
}
internal static InvalidOperationException AsyncOperationPending()
{
return InvalidOperation(Res.GetString(Res.ADP_PendingAsyncOperation));
return InvalidOperation(SR.GetString(SR.ADP_PendingAsyncOperation));
}
//
@@ -712,45 +711,45 @@ namespace System.Data.Common
//
internal static Exception StreamClosed([CallerMemberName] string method = "")
{
return InvalidOperation(Res.GetString(Res.ADP_StreamClosed, method));
return InvalidOperation(SR.GetString(SR.ADP_StreamClosed, method));
}
internal static IOException ErrorReadingFromStream(Exception internalException)
{
return IO(Res.GetString(Res.SqlMisc_StreamErrorMessage), internalException);
return IO(SR.GetString(SR.SqlMisc_StreamErrorMessage), internalException);
}
internal static ArgumentException InvalidDataType(string typeName)
{
return Argument(Res.GetString(Res.ADP_InvalidDataType, typeName));
return Argument(SR.GetString(SR.ADP_InvalidDataType, typeName));
}
internal static ArgumentException UnknownDataType(Type dataType)
{
return Argument(Res.GetString(Res.ADP_UnknownDataType, dataType.FullName));
return Argument(SR.GetString(SR.ADP_UnknownDataType, dataType.FullName));
}
internal static ArgumentException DbTypeNotSupported(System.Data.DbType type, Type enumtype)
{
return Argument(Res.GetString(Res.ADP_DbTypeNotSupported, type.ToString(), enumtype.Name));
return Argument(SR.GetString(SR.ADP_DbTypeNotSupported, type.ToString(), enumtype.Name));
}
internal static ArgumentException InvalidOffsetValue(int value)
{
return Argument(Res.GetString(Res.ADP_InvalidOffsetValue, value.ToString(CultureInfo.InvariantCulture)));
return Argument(SR.GetString(SR.ADP_InvalidOffsetValue, value.ToString(CultureInfo.InvariantCulture)));
}
internal static ArgumentException InvalidSizeValue(int value)
{
return Argument(Res.GetString(Res.ADP_InvalidSizeValue, value.ToString(CultureInfo.InvariantCulture)));
return Argument(SR.GetString(SR.ADP_InvalidSizeValue, value.ToString(CultureInfo.InvariantCulture)));
}
internal static ArgumentException ParameterValueOutOfRange(Decimal value)
{
return ADP.Argument(Res.GetString(Res.ADP_ParameterValueOutOfRange, value.ToString((IFormatProvider)null)));
return ADP.Argument(SR.GetString(SR.ADP_ParameterValueOutOfRange, value.ToString((IFormatProvider)null)));
}
internal static ArgumentException ParameterValueOutOfRange(SqlDecimal value)
{
return ADP.Argument(Res.GetString(Res.ADP_ParameterValueOutOfRange, value.ToString()));
return ADP.Argument(SR.GetString(SR.ADP_ParameterValueOutOfRange, value.ToString()));
}
internal static ArgumentException VersionDoesNotSupportDataType(string typeName)
{
return Argument(Res.GetString(Res.ADP_VersionDoesNotSupportDataType, typeName));
return Argument(SR.GetString(SR.ADP_VersionDoesNotSupportDataType, typeName));
}
internal static Exception ParameterConversionFailed(object value, Type destType, Exception inner)
{
@@ -758,7 +757,7 @@ namespace System.Data.Common
Debug.Assert(null != inner, "null inner on conversion failure");
Exception e;
string message = Res.GetString(Res.ADP_ParameterConversionFailed, value.GetType().Name, destType.Name);
string message = SR.GetString(SR.ADP_ParameterConversionFailed, value.GetType().Name, destType.Name);
if (inner is ArgumentException)
{
e = new ArgumentException(message, inner);
@@ -807,11 +806,11 @@ namespace System.Data.Common
//
internal static Exception ParallelTransactionsNotSupported(DbConnection obj)
{
return InvalidOperation(Res.GetString(Res.ADP_ParallelTransactionsNotSupported, obj.GetType().Name));
return InvalidOperation(SR.GetString(SR.ADP_ParallelTransactionsNotSupported, obj.GetType().Name));
}
internal static Exception TransactionZombied(DbTransaction obj)
{
return InvalidOperation(Res.GetString(Res.ADP_TransactionZombied, obj.GetType().Name));
return InvalidOperation(SR.GetString(SR.ADP_TransactionZombied, obj.GetType().Name));
}
@@ -1077,10 +1076,10 @@ namespace System.Data.Common
}
internal static readonly string[] AzureSqlServerEndpoints = {Res.GetString(Res.AZURESQL_GenericEndpoint),
Res.GetString(Res.AZURESQL_GermanEndpoint),
Res.GetString(Res.AZURESQL_UsGovEndpoint),
Res.GetString(Res.AZURESQL_ChinaEndpoint)};
internal static readonly string[] AzureSqlServerEndpoints = {SR.GetString(SR.AZURESQL_GenericEndpoint),
SR.GetString(SR.AZURESQL_GermanEndpoint),
SR.GetString(SR.AZURESQL_UsGovEndpoint),
SR.GetString(SR.AZURESQL_ChinaEndpoint)};
// This method assumes dataSource parameter is in TCP connection string format.
internal static bool IsAzureSqlServerEndpoint(string dataSource)
@@ -1099,7 +1098,7 @@ namespace System.Data.Common
dataSource = dataSource.Substring(0, i);
}
// trim redundant whitespaces
// trim redundant whitespace
dataSource = dataSource.Trim();
// check if servername end with any azure endpoints

View File

@@ -155,7 +155,7 @@ namespace System.Data.Common
return false;
else
{
string tmp = stringValue.Trim(); // Remove leading & trailing white space.
string tmp = stringValue.Trim(); // Remove leading & trailing whitespace.
if (CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
return true;
else if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))
@@ -184,7 +184,7 @@ namespace System.Data.Common
return false;
else
{
string tmp = stringValue.Trim(); // Remove leading & trailing white space.
string tmp = stringValue.Trim(); // Remove leading & trailing whitespace.
if (CompareInsensitiveInvariant(tmp, "sspi") || CompareInsensitiveInvariant(tmp, "true") || CompareInsensitiveInvariant(tmp, "yes"))
return true;
else if (CompareInsensitiveInvariant(tmp, "false") || CompareInsensitiveInvariant(tmp, "no"))

View File

@@ -27,7 +27,7 @@ namespace System.Data.Common
return false;
else
{
string tmp = svalue.Trim(); // Remove leading & trailing white space.
string tmp = svalue.Trim(); // Remove leading & trailing whitespace.
if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "true") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "yes"))
return true;
else if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "false") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "no"))
@@ -57,7 +57,7 @@ namespace System.Data.Common
return false;
else
{
string tmp = svalue.Trim(); // Remove leading & trailing white space.
string tmp = svalue.Trim(); // Remove leading & trailing whitespace.
if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "sspi") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "true") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "yes"))
return true;
else if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "false") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "no"))
@@ -169,7 +169,7 @@ namespace System.Data.Common
return result;
}
// try again after remove leading & trailing whitespaces.
// try again after remove leading & trailing whitespace.
sValue = sValue.Trim();
if (TryConvertToApplicationIntent(sValue, out result))
{
@@ -338,7 +338,7 @@ namespace System.Data.Common
internal const string DATABASE = "database";
//internal const string IntegratedSecurity = TRUSTEDCONNECTION;
internal const string TRUSTEDCONNECTION = "trusted_connection"; // underscore introduced in everett
internal const string TRUSTEDCONNECTION = "trusted_connection"; // underscore introduced in Everett
//internal const string LoadBalanceTimeout = ConnectionLifetime;
internal const string ConnectionLifetime = "connection lifetime";

View File

@@ -81,7 +81,7 @@ namespace System.Data.Common
MPIState state = MPIState.MPI_Value; // Initialize the starting state
StringBuilder sb = new StringBuilder(name.Length); // String buffer to hold the string being currently built, init the string builder so it will never be resized
StringBuilder whitespaceSB = null; // String buffer to hold white space used when parsing nonquoted strings 'a b . c d' = 'a b' and 'c d'
StringBuilder whitespaceSB = null; // String buffer to hold whitespace used when parsing nonquoted strings 'a b . c d' = 'a b' and 'c d'
char rightQuoteChar = ' '; // Right quote character to use given the left quote character found.
for (int index = 0; index < name.Length; ++index)
{
@@ -154,7 +154,7 @@ namespace System.Data.Common
whitespaceSB = new StringBuilder();
}
whitespaceSB.Length = 0;
whitespaceSB.Append(testchar); // start to record the white space, if we are parsing a name like "foo bar" we should return "foo bar"
whitespaceSB.Append(testchar); // start to record the whitespace, if we are parsing a name like "foo bar" we should return "foo bar"
state = MPIState.MPI_LookForNextCharOrSeparator;
}
else
@@ -221,7 +221,7 @@ namespace System.Data.Common
}
else
if (!IsWhitespace(testchar))
{ // If it is not white space we got problems
{ // If it is not whitespace we got problems
throw ADP.InvalidMultipartNameIncorrectUsageOfQuotes(property, name);
}
else

View File

@@ -6,8 +6,6 @@
//------------------------------------------------------------------------------
using Res = System.SR;
namespace System.Data
{
@@ -44,7 +42,7 @@ namespace System.Data
}
public static Exception InvalidOffsetLength()
{
return _Argument(Res.GetString(Res.Data_InvalidOffsetLength));
return _Argument(SR.GetString(SR.Data_InvalidOffsetLength));
}
}// ExceptionBuilder
}

View File

@@ -7,12 +7,11 @@
//------------------------------------------------------------------------------
using System.Runtime.Serialization;
using Res = System.SR;
namespace System.Data
{
[Serializable]
public sealed class OperationAbortedException : Exception
public sealed class OperationAbortedException : SystemException
{
private OperationAbortedException(string message, Exception innerException) : base(message, innerException)
{
@@ -28,11 +27,11 @@ namespace System.Data
OperationAbortedException e;
if (inner == null)
{
e = new OperationAbortedException(Res.GetString(Res.ADP_OperationAborted), null);
e = new OperationAbortedException(SR.GetString(SR.ADP_OperationAborted), null);
}
else
{
e = new OperationAbortedException(Res.GetString(Res.ADP_OperationAbortedExceptionMessage), inner);
e = new OperationAbortedException(SR.GetString(SR.ADP_OperationAbortedExceptionMessage), inner);
}
return e;
}

View File

@@ -14,8 +14,11 @@ namespace System.Data.ProviderBase
{
internal static DbConnectionPoolIdentity GetCurrent()
{
throw new PlatformNotSupportedException();
string sidString = (!string.IsNullOrWhiteSpace(System.Environment.UserDomainName) ? System.Environment.UserDomainName + "\\" : "")
+ System.Environment.UserName;
bool isNetwork = false;
bool isRestricted = false;
return new DbConnectionPoolIdentity(sidString, isRestricted, isNetwork);
}
}
}

Some files were not shown because too many files have changed in this diff Show More