diff --git a/DbTargets/DbTargets.csproj b/DbTargets/DbTargets.csproj index df30b1f..9ffbebc 100644 --- a/DbTargets/DbTargets.csproj +++ b/DbTargets/DbTargets.csproj @@ -1,22 +1,7 @@ - - - - - - - - + - Debug - AnyCPU - {25826F24-B794-4148-A81B-4370503306F6} + net6.0 Exe - Properties - DbTargets - DbTargets - v4.8 - 512 - true publish\ true Disk @@ -32,45 +17,17 @@ false false true - - - + false x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 ..\QueryMultiDb\QueryMultiDb.ruleset x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 false ..\QueryMultiDb\QueryMultiDb.ruleset - - - - - - - - - - - - - False @@ -94,22 +51,15 @@ - - - - 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}. - - - - - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + + + \ No newline at end of file diff --git a/DbTargets/Program.cs b/DbTargets/Program.cs index 576bf0a..d924863 100644 --- a/DbTargets/Program.cs +++ b/DbTargets/Program.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Data.SqlClient; +using Microsoft.Data.SqlClient; using System.IO; using System.Linq; using System.Reflection; @@ -93,7 +94,7 @@ private static List QueryDatabaseNames(string serverName) var titleAttribute = (AssemblyTitleAttribute) Assembly.GetExecutingAssembly() .GetCustomAttribute(typeof(AssemblyTitleAttribute)); - var connectionStringBuilder = new SqlConnectionStringBuilder + var connectionStringBuilder = new Microsoft.Data.SqlClient.SqlConnectionStringBuilder { DataSource = serverName, InitialCatalog = "master", @@ -103,15 +104,15 @@ private static List QueryDatabaseNames(string serverName) WorkstationID = Environment.MachineName, ApplicationName = titleAttribute.Title, - ApplicationIntent = ApplicationIntent.ReadWrite, - NetworkLibrary = "dbmssocn", + ApplicationIntent = Microsoft.Data.SqlClient.ApplicationIntent.ReadWrite, + //NetworkLibrary = "dbmssocn", Pooling = false, Authentication = SqlAuthenticationMethod.NotSpecified }; var databaseNames = new List(500); - using (var connection = new SqlConnection(connectionStringBuilder.ToString())) + using (var connection = new System.Data.SqlClient.SqlConnection(connectionStringBuilder.ToString())) { connection.Open(); diff --git a/DbTargets/packages.config b/DbTargets/packages.config deleted file mode 100644 index 65be833..0000000 --- a/DbTargets/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDb.Common.Tests.Unit/QueryMultiDb.Common.Tests.Unit.csproj b/QueryMultiDb.Common.Tests.Unit/QueryMultiDb.Common.Tests.Unit.csproj index da9ae0c..ba14bdb 100644 --- a/QueryMultiDb.Common.Tests.Unit/QueryMultiDb.Common.Tests.Unit.csproj +++ b/QueryMultiDb.Common.Tests.Unit/QueryMultiDb.Common.Tests.Unit.csproj @@ -1,68 +1,9 @@ - - - - - - - - - - + - Debug - AnyCPU - {269E2C11-E2F6-452D-8A10-12B6593F2607} + net6.0 Library - Properties - QueryMultiDb.Common.Tests.Unit - QueryMultiDb.Common.Tests.Unit - v4.8 - 512 - true - - - + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - @@ -76,24 +17,14 @@ - - {6b7d3eb8-a8cf-4b0d-9577-4f5c424cdfcb} - QueryMultiDb.Common - + + + + + + + + all + - - - - 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/QueryMultiDb.Common.Tests.Unit/packages.config b/QueryMultiDb.Common.Tests.Unit/packages.config deleted file mode 100644 index d052022..0000000 --- a/QueryMultiDb.Common.Tests.Unit/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDb.Common/QueryMultiDb.Common.csproj b/QueryMultiDb.Common/QueryMultiDb.Common.csproj index 8bf022b..12fb2d3 100644 --- a/QueryMultiDb.Common/QueryMultiDb.Common.csproj +++ b/QueryMultiDb.Common/QueryMultiDb.Common.csproj @@ -1,56 +1,9 @@ - - - - - - - - + - Debug - AnyCPU - {6B7D3EB8-A8CF-4B0D-9577-4F5C424CDFCB} + net6.0 Library - Properties - QueryMultiDb.Common - QueryMultiDb.Common - v4.8 - 512 - true - - - + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - @@ -62,15 +15,10 @@ - - - - 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}. - - - - - - - + + + + all + + \ No newline at end of file diff --git a/QueryMultiDb.Common/packages.config b/QueryMultiDb.Common/packages.config deleted file mode 100644 index 65be833..0000000 --- a/QueryMultiDb.Common/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDb.Tests.System/QueryMultiDb.Tests.System.csproj b/QueryMultiDb.Tests.System/QueryMultiDb.Tests.System.csproj index ad7aece..23c2e90 100644 --- a/QueryMultiDb.Tests.System/QueryMultiDb.Tests.System.csproj +++ b/QueryMultiDb.Tests.System/QueryMultiDb.Tests.System.csproj @@ -1,85 +1,16 @@ - - - - - - - - - - + - Debug - AnyCPU - {E92D6EEA-4054-45A0-A1C9-A447764892D1} + net6.0 Library - Properties - QueryMultiDb.Tests.System - QueryMultiDb.Tests.System - v4.8 - 512 - true - - - + false - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 x64 - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - ..\packages\DocumentFormat.OpenXml.2.10.1\lib\net46\DocumentFormat.OpenXml.dll - - - - - - ..\packages\System.IO.Packaging.4.7.0\lib\net46\System.IO.Packaging.dll - - - - - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - - - @@ -97,10 +28,7 @@ - - {6b7d3eb8-a8cf-4b0d-9577-4f5c424cdfcb} - QueryMultiDb.Common - + @@ -122,20 +50,18 @@ - - - - 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}. - - - - - - - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + all + + - \ No newline at end of file diff --git a/QueryMultiDb.Tests.System/packages.config b/QueryMultiDb.Tests.System/packages.config deleted file mode 100644 index 2e7cb63..0000000 --- a/QueryMultiDb.Tests.System/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDb.Tests.Unit/QueryMultiDb.Tests.Unit.csproj b/QueryMultiDb.Tests.Unit/QueryMultiDb.Tests.Unit.csproj index ae5a9d0..e324a05 100644 --- a/QueryMultiDb.Tests.Unit/QueryMultiDb.Tests.Unit.csproj +++ b/QueryMultiDb.Tests.Unit/QueryMultiDb.Tests.Unit.csproj @@ -1,80 +1,15 @@ - - - - - - - - - - + - Debug - AnyCPU - {C9D06460-FAA9-4DD8-A5A8-3C0C56395F0A} + net6.0 Library - Properties - QueryMultiDb.Tests.Unit - QueryMultiDb.Tests.Unit - v4.8 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x64 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false x64 - - - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - True - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - - - - - {b22a5cf5-41f2-43cb-9ec2-386647e4b6ee} - QueryMultiDb - + @@ -88,26 +23,12 @@ - - - - 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}. - - - - - - - - - - - - + + + + + + all + + \ No newline at end of file diff --git a/QueryMultiDb.Tests.Unit/packages.config b/QueryMultiDb.Tests.Unit/packages.config deleted file mode 100644 index a41f0ed..0000000 --- a/QueryMultiDb.Tests.Unit/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDb/QueryMultiDb.csproj b/QueryMultiDb/QueryMultiDb.csproj index 61a3132..0a1523c 100644 --- a/QueryMultiDb/QueryMultiDb.csproj +++ b/QueryMultiDb/QueryMultiDb.csproj @@ -1,23 +1,7 @@ - - - - - - - - + - Debug - AnyCPU - {B22A5CF5-41F2-43CB-9EC2-386647E4B6EE} + net6.0 Exe - Properties - QueryMultiDb - QueryMultiDb - v4.8 - 512 - true - false publish\ true @@ -33,127 +17,31 @@ 1.0.0.%2a false true - - + false x64 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 false QueryMultiDb.ruleset true x64 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 QueryMultiDb.ruleset false - - ..\packages\CommandLineArgumentsParser.3.0.19\lib\net452\CommandLineArgumentsParser.dll - - - ..\packages\CsvHelper.15.0.3\lib\net47\CsvHelper.dll - - - ..\packages\DocumentFormat.OpenXml.2.10.1\lib\net46\DocumentFormat.OpenXml.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NLog.4.7.0\lib\net45\NLog.dll - - - - - - ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - - ..\packages\System.IO.Packaging.4.7.0\lib\net46\System.IO.Packaging.dll - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest Designer - - + Designer - - @@ -168,10 +56,7 @@ - - {6b7d3eb8-a8cf-4b0d-9577-4f5c424cdfcb} - QueryMultiDb.Common - + @@ -184,22 +69,28 @@ - - - - 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}. - - - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + all + + \ No newline at end of file diff --git a/QueryMultiDb/TableTarget.cs b/QueryMultiDb/TableTarget.cs index e8c2e17..d2323d4 100644 --- a/QueryMultiDb/TableTarget.cs +++ b/QueryMultiDb/TableTarget.cs @@ -25,7 +25,6 @@ public TableTarget() var logTable = new Table(logColumns, _logRows, Table.LogsId); Logs = logTable; - OptimizeBufferReuse = true; } public TableTarget(string name) : this() diff --git a/QueryMultiDb/packages.config b/QueryMultiDb/packages.config deleted file mode 100644 index 43b9926..0000000 --- a/QueryMultiDb/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/QueryMultiDbGui/Program.cs b/QueryMultiDbGui/Program.cs index ba2196d..4109ac5 100644 --- a/QueryMultiDbGui/Program.cs +++ b/QueryMultiDbGui/Program.cs @@ -12,6 +12,7 @@ internal static class Program private static void Main() { Application.EnableVisualStyles(); + Application.SetHighDpiMode(HighDpiMode.SystemAware); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new MainForm()); } diff --git a/QueryMultiDbGui/QueryMultiDbGui.csproj b/QueryMultiDbGui/QueryMultiDbGui.csproj index f803d9b..af5133f 100644 --- a/QueryMultiDbGui/QueryMultiDbGui.csproj +++ b/QueryMultiDbGui/QueryMultiDbGui.csproj @@ -1,117 +1,21 @@ - - - - - - - - + - Debug - AnyCPU - {67CF094E-3025-4055-BB1C-8351231F7EB9} + net6.0-windows WinExe - QueryMultiDbGui - QueryMultiDbGui - v4.8 - 512 - true - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + true + true Icon\icon.ico - - - - - - - - - - - - Form - - - AboutForm.cs - - - + UserControl - - FileDisplayControl.cs - - - Form - - - MainForm.cs - - - - - - - AboutForm.cs - - - FileDisplayControl.cs - - - MainForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - + @@ -126,10 +30,7 @@ - - {6b7d3eb8-a8cf-4b0d-9577-4f5c424cdfcb} - QueryMultiDb.Common - + @@ -142,15 +43,11 @@ - - - - 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}. - - - - - - - + + + + all + + + \ No newline at end of file diff --git a/QueryMultiDbGui/appsettings.json b/QueryMultiDbGui/appsettings.json new file mode 100644 index 0000000..d88cc07 --- /dev/null +++ b/QueryMultiDbGui/appsettings.json @@ -0,0 +1,6 @@ +{ + "QueryMultiDbExecutableFilename": "QueryMultiDb.exe", + "QueryMultiDbDocumentsRootDirectoryName": "QueryMultiDb", + "DocumentsTargetsDirectoryName": "Targets", + "DocumentsExtractionsDirectoryName": "Extractions" +} \ No newline at end of file diff --git a/QueryMultiDbGui/packages.config b/QueryMultiDbGui/packages.config deleted file mode 100644 index 65be833..0000000 --- a/QueryMultiDbGui/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file