From b19392e71d5b92abd2f14a22d0a63a6864579898 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 7 Feb 2020 07:20:18 -0500 Subject: [PATCH 1/4] Converted AsyncDataAdapter.Tests to .Net Core Replaced System.Data.SqlClient with Microsoft.Data.SqlClient --- .../AsyncDataAdapter.Tests.csproj | 87 +++---------------- .../Properties/AssemblyInfo.cs | 6 -- AsyncDataAdapter.Tests/SqlDataAdapterTest.cs | 10 +-- AsyncDataAdapter.sln | 16 ++-- AsyncDataAdapter/AsyncDataAdapter.csproj | 2 +- AsyncDataAdapter/DataAdapter.cs | 6 +- AsyncDataAdapter/SqlCommandSet.cs | 2 +- AsyncDataAdapter/SqlDataAdapter.cs | 2 +- 8 files changed, 33 insertions(+), 98 deletions(-) diff --git a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj index 0b7d7fa..bad4fd9 100644 --- a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj +++ b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj @@ -1,79 +1,20 @@ - - - - + + - Debug - AnyCPU - {34B7E6F3-858A-489B-BDD0-45CC6EB62551} - Library - Properties - AsyncDataAdapter.Tests - AsyncDataAdapter.Tests - v4.6.2 - 512 - - - + netcoreapp3.1 + + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - - - - - - ..\packages\System.Data.SqlClient.4.5.1\lib\net461\System.Data.SqlClient.dll - - - - - - - - - - - + - + + + + + - - {0384745d-0e1d-4f87-a24e-2cf5762faab1} - AsyncDataAdapter - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + + diff --git a/AsyncDataAdapter.Tests/Properties/AssemblyInfo.cs b/AsyncDataAdapter.Tests/Properties/AssemblyInfo.cs index b10b461..6aba4e3 100644 --- a/AsyncDataAdapter.Tests/Properties/AssemblyInfo.cs +++ b/AsyncDataAdapter.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,7 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("AsyncDataAdapter.Tests")] [assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("AsyncDataAdapter.Tests")] [assembly: AssemblyCopyright("Copyright © Microsoft 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +28,3 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/AsyncDataAdapter.Tests/SqlDataAdapterTest.cs b/AsyncDataAdapter.Tests/SqlDataAdapterTest.cs index 22850e4..5e05952 100644 --- a/AsyncDataAdapter.Tests/SqlDataAdapterTest.cs +++ b/AsyncDataAdapter.Tests/SqlDataAdapterTest.cs @@ -1,7 +1,7 @@ using System; using System.Data; -using System.Data.SqlClient; using System.Threading.Tasks; +using Microsoft.Data.SqlClient; using NUnit.Framework; namespace AsyncDataAdapter.Tests @@ -9,7 +9,7 @@ namespace AsyncDataAdapter.Tests [TestFixture] public class SqlDataAdapterTest { - // private const string ConnectionString = @"server=.\sqlexpress;database=TestDb;Trusted_Connection=Yes"; + //private const string ConnectionString = @"server=.\sqlexpress;database=TestDb;Trusted_Connection=Yes"; private const string ConnectionString = @"server=.\SQL2017;database=TestDb;Trusted_Connection=Yes"; [Test] @@ -54,7 +54,7 @@ public void FillDataTable() c.CommandType = CommandType.StoredProcedure; c.Parameters.Add("@Number", SqlDbType.Int).Value = 100000; - using (var a = new System.Data.SqlClient.SqlDataAdapter(c)) + using (var a = new Microsoft.Data.SqlClient.SqlDataAdapter(c)) { var dt = new DataTable(); var r = a.Fill(dt); @@ -113,7 +113,7 @@ public void FillDataSet() c.CommandType = CommandType.StoredProcedure; c.Parameters.Add("@Number", SqlDbType.Int).Value = 100000; - using (var a = new System.Data.SqlClient.SqlDataAdapter(c)) + using (var a = new Microsoft.Data.SqlClient.SqlDataAdapter(c)) { var ds = new DataSet(); var r = a.Fill(ds); @@ -196,7 +196,7 @@ public void FillDataSetMulti() c.Parameters.Add("@Number2", SqlDbType.Int).Value = 300000; c.Parameters.Add("@Number3", SqlDbType.Int).Value = 500000; - using (var a = new System.Data.SqlClient.SqlDataAdapter(c)) + using (var a = new Microsoft.Data.SqlClient.SqlDataAdapter(c)) { var ds = new DataSet(); var r = a.Fill(ds); diff --git a/AsyncDataAdapter.sln b/AsyncDataAdapter.sln index 058b328..a560ff9 100644 --- a/AsyncDataAdapter.sln +++ b/AsyncDataAdapter.sln @@ -1,12 +1,10 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2019 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncDataAdapter", "AsyncDataAdapter\AsyncDataAdapter.csproj", "{0384745D-0E1D-4F87-A24E-2CF5762FAAB1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncDataAdapter.Tests", "AsyncDataAdapter.Tests\AsyncDataAdapter.Tests.csproj", "{34B7E6F3-858A-489B-BDD0-45CC6EB62551}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{366B2040-653C-4536-86F6-7A8B8765D6AF}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore @@ -18,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncDataAdapter.Tests", "AsyncDataAdapter.Tests\AsyncDataAdapter.Tests.csproj", "{F53AB0CC-DFBC-4D41-A0E6-B670FDABF67A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -28,10 +28,10 @@ Global {0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Debug|Any CPU.Build.0 = Debug|Any CPU {0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.ActiveCfg = Release|Any CPU {0384745D-0E1D-4F87-A24E-2CF5762FAAB1}.Release|Any CPU.Build.0 = Release|Any CPU - {34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34B7E6F3-858A-489B-BDD0-45CC6EB62551}.Release|Any CPU.Build.0 = Release|Any CPU + {F53AB0CC-DFBC-4D41-A0E6-B670FDABF67A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F53AB0CC-DFBC-4D41-A0E6-B670FDABF67A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F53AB0CC-DFBC-4D41-A0E6-B670FDABF67A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F53AB0CC-DFBC-4D41-A0E6-B670FDABF67A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AsyncDataAdapter/AsyncDataAdapter.csproj b/AsyncDataAdapter/AsyncDataAdapter.csproj index c60c360..b335309 100644 --- a/AsyncDataAdapter/AsyncDataAdapter.csproj +++ b/AsyncDataAdapter/AsyncDataAdapter.csproj @@ -30,7 +30,7 @@ - + diff --git a/AsyncDataAdapter/DataAdapter.cs b/AsyncDataAdapter/DataAdapter.cs index f762202..f13e000 100644 --- a/AsyncDataAdapter/DataAdapter.cs +++ b/AsyncDataAdapter/DataAdapter.cs @@ -376,7 +376,7 @@ override protected void Dispose(bool disposing) base.Dispose(disposing); // notify base classes } - virtual public async Task FillSchemaAsync(DataSet dataSet, SchemaType schemaType) + virtual public Task FillSchemaAsync(DataSet dataSet, SchemaType schemaType) { // V1.0.3300 throw ADP.NotSupported(); } @@ -490,7 +490,7 @@ internal async Task FillSchemaFromReaderAsync(DataSet dataset, DataTable return value; // null if datatable had no results } - virtual public async Task FillAsync(DataSet dataSet) + virtual public Task FillAsync(DataSet dataSet) { // V1.0.3300 throw ADP.NotSupported(); } @@ -903,7 +903,7 @@ private void OnFillErrorHandler(Exception e, DataTable dataTable, object[] dataV } } - virtual public async Task UpdateAsync(DataSet dataSet) + virtual public Task UpdateAsync(DataSet dataSet) { // V1.0.3300 throw ADP.NotSupported(); } diff --git a/AsyncDataAdapter/SqlCommandSet.cs b/AsyncDataAdapter/SqlCommandSet.cs index cb2000b..0e345dc 100644 --- a/AsyncDataAdapter/SqlCommandSet.cs +++ b/AsyncDataAdapter/SqlCommandSet.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Text; using System.Text.RegularExpressions; diff --git a/AsyncDataAdapter/SqlDataAdapter.cs b/AsyncDataAdapter/SqlDataAdapter.cs index 383d6e9..8605be1 100644 --- a/AsyncDataAdapter/SqlDataAdapter.cs +++ b/AsyncDataAdapter/SqlDataAdapter.cs @@ -10,7 +10,7 @@ using System.ComponentModel; using System.Data; using System.Data.Common; -using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.Diagnostics; namespace AsyncDataAdapter From 19968c9e30c056701f82c28ddef9b298ed225036 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 7 Feb 2020 07:26:13 -0500 Subject: [PATCH 2/4] Changed Framework to NetStandard 2.0 --- AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj index bad4fd9..ea6a7b0 100644 --- a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj +++ b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + netstandard2.0 false From f6ec1e22aab7ff4da6e5c82dcc21f5867b62a4af Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 7 Feb 2020 07:40:30 -0500 Subject: [PATCH 3/4] Removed Test Adapter --- AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj index ea6a7b0..7446382 100644 --- a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj +++ b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj @@ -1,16 +1,15 @@ - netstandard2.0 + netstandard2.1 false - - + From f9a8a53858e87507f0afd8e9f387a798c1d247ea Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 7 Feb 2020 07:49:47 -0500 Subject: [PATCH 4/4] Changed to NetStandard 2.0 --- AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj index 7446382..408cf3c 100644 --- a/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj +++ b/AsyncDataAdapter.Tests/AsyncDataAdapter.Tests.csproj @@ -1,7 +1,7 @@ - netstandard2.1 + netstandard2.0 false