From 5d4c7dfe687c0eeebb89f2a8c72f04c991d0b936 Mon Sep 17 00:00:00 2001 From: Michal Buzik Date: Mon, 12 Feb 2024 21:44:42 +0100 Subject: [PATCH] log4net ver 2.0.15 --- Common/Common.csproj | 4 +- Config/Config.csproj | 2 +- DeviceTest/DeviceTest.csproj | 5 +- GenericTest/GenericTest.csproj | 2 +- LabelPrinting/LabelPrinting.csproj | 4 +- MergeResultsDBs/MergeResultsDBs.csproj | 5 +- OrderManagement/OrderManagement.csproj | 4 +- ProductionTracing/ProductionTracing.csproj | 4 +- ProductionTracing/packages.config | 1 + RecordProcessing/RecordProcessing.csproj | 4 +- Results/Results.csproj | 4 +- ResultsBrowser/ResultsBrowser.csproj | 6 +- ResultsBrowser/packages.config | 1 + SharedDatabase/SharedDatabase.csproj | 4 +- TBF/TBF.csproj | 28 +++- TBF/packages.config | 2 +- TBFTests/TBFTests.csproj | 147 ++++++++++++++++++ TBFTests/packages.config | 16 ++ UserManagement/UserManagement.csproj | 4 +- .../WorkflowConfigurator.csproj | 4 +- Workplace/Workplace.csproj | 4 +- Workplace/packages.config | 1 + 22 files changed, 223 insertions(+), 33 deletions(-) create mode 100644 TBFTests/TBFTests.csproj create mode 100644 TBFTests/packages.config diff --git a/Common/Common.csproj b/Common/Common.csproj index 6a6c5a336..6d7c93884 100644 --- a/Common/Common.csproj +++ b/Common/Common.csproj @@ -30,8 +30,8 @@ 4 - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll diff --git a/Config/Config.csproj b/Config/Config.csproj index e6ac2e803..81dbba27c 100644 --- a/Config/Config.csproj +++ b/Config/Config.csproj @@ -43,7 +43,7 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/DeviceTest/DeviceTest.csproj b/DeviceTest/DeviceTest.csproj index 1ebedb7f1..4df32557c 100644 --- a/DeviceTest/DeviceTest.csproj +++ b/DeviceTest/DeviceTest.csproj @@ -40,9 +40,8 @@ DeviceTest.Program - - False - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll diff --git a/GenericTest/GenericTest.csproj b/GenericTest/GenericTest.csproj index d1282e1b2..918b66e34 100644 --- a/GenericTest/GenericTest.csproj +++ b/GenericTest/GenericTest.csproj @@ -49,7 +49,7 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/LabelPrinting/LabelPrinting.csproj b/LabelPrinting/LabelPrinting.csproj index 495dc5515..009040fa4 100644 --- a/LabelPrinting/LabelPrinting.csproj +++ b/LabelPrinting/LabelPrinting.csproj @@ -46,8 +46,8 @@ False ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/MergeResultsDBs/MergeResultsDBs.csproj b/MergeResultsDBs/MergeResultsDBs.csproj index 277607a7f..44cc691ec 100644 --- a/MergeResultsDBs/MergeResultsDBs.csproj +++ b/MergeResultsDBs/MergeResultsDBs.csproj @@ -38,8 +38,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll @@ -62,6 +62,7 @@ + diff --git a/OrderManagement/OrderManagement.csproj b/OrderManagement/OrderManagement.csproj index ab1893d72..d57934961 100644 --- a/OrderManagement/OrderManagement.csproj +++ b/OrderManagement/OrderManagement.csproj @@ -48,8 +48,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/ProductionTracing/ProductionTracing.csproj b/ProductionTracing/ProductionTracing.csproj index 0316348f0..bc712b860 100644 --- a/ProductionTracing/ProductionTracing.csproj +++ b/ProductionTracing/ProductionTracing.csproj @@ -49,8 +49,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll True - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll False diff --git a/ProductionTracing/packages.config b/ProductionTracing/packages.config index 3f52f5e26..1cebf2863 100644 --- a/ProductionTracing/packages.config +++ b/ProductionTracing/packages.config @@ -3,4 +3,5 @@ + \ No newline at end of file diff --git a/RecordProcessing/RecordProcessing.csproj b/RecordProcessing/RecordProcessing.csproj index 38272f0f7..d916984be 100644 --- a/RecordProcessing/RecordProcessing.csproj +++ b/RecordProcessing/RecordProcessing.csproj @@ -34,8 +34,8 @@ ..\packages\QrCode.Net.0.4.0.0\net40\Gma.QrCodeNet.Encoding.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll diff --git a/Results/Results.csproj b/Results/Results.csproj index 77138373e..29acb1445 100644 --- a/Results/Results.csproj +++ b/Results/Results.csproj @@ -44,8 +44,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj index 792bcefc1..7038b8375 100644 --- a/ResultsBrowser/ResultsBrowser.csproj +++ b/ResultsBrowser/ResultsBrowser.csproj @@ -47,8 +47,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll @@ -65,7 +65,9 @@ True + + diff --git a/ResultsBrowser/packages.config b/ResultsBrowser/packages.config index f0df2ac24..ecd856b08 100644 --- a/ResultsBrowser/packages.config +++ b/ResultsBrowser/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/SharedDatabase/SharedDatabase.csproj b/SharedDatabase/SharedDatabase.csproj index b5da7fb94..c7006dbab 100644 --- a/SharedDatabase/SharedDatabase.csproj +++ b/SharedDatabase/SharedDatabase.csproj @@ -36,8 +36,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index eb7320480..579bd0301 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -110,9 +110,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - False - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll @@ -981,6 +980,23 @@ PrinterCfgCtrl.cs + + + + + + UserControl + + + PrinterCfgCtrl.cs + + + + Form + + + PrinterTestBenchComponentSelectorDlg.cs + @@ -2816,6 +2832,12 @@ PrinterCfgCtrl.cs + + PrinterCfgCtrl.cs + + + PrinterTestBenchComponentSelectorDlg.cs + PrinterCfgCtrl.cs diff --git a/TBF/packages.config b/TBF/packages.config index 3da27f8c5..7c92e8860 100644 --- a/TBF/packages.config +++ b/TBF/packages.config @@ -3,11 +3,11 @@ - + \ No newline at end of file diff --git a/TBFTests/TBFTests.csproj b/TBFTests/TBFTests.csproj new file mode 100644 index 000000000..33a7c412e --- /dev/null +++ b/TBFTests/TBFTests.csproj @@ -0,0 +1,147 @@ + + + + + Debug + AnyCPU + {77EB589F-C670-4489-AAD6-2A3C02061FD1} + Library + Properties + TBFTests + TBFTests + v4.7.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + + ..\packages\JetBrains.Annotations.2023.3.0\lib\net20\JetBrains.Annotations.dll + + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Configuration.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + + ..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Moq.4.20.70\lib\net462\Moq.dll + + + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\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 + + + + + + + + + + + + + + + + + + + + + + + {743df7db-c7b6-42eb-986d-0f485e5588e4} + Config + + + {8648FD92-CDA1-4C3A-B5F9-FE547CE1FA48} + TBF + + + + + + + False + + + False + + + False + + + False + + + + + + + + + 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/TBFTests/packages.config b/TBFTests/packages.config new file mode 100644 index 000000000..e52b73a4a --- /dev/null +++ b/TBFTests/packages.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UserManagement/UserManagement.csproj b/UserManagement/UserManagement.csproj index 8f4f918ec..cbc8bb472 100644 --- a/UserManagement/UserManagement.csproj +++ b/UserManagement/UserManagement.csproj @@ -61,8 +61,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/WorkflowConfigurator/WorkflowConfigurator.csproj b/WorkflowConfigurator/WorkflowConfigurator.csproj index 301cea129..074d53ac0 100644 --- a/WorkflowConfigurator/WorkflowConfigurator.csproj +++ b/WorkflowConfigurator/WorkflowConfigurator.csproj @@ -46,8 +46,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll diff --git a/Workplace/Workplace.csproj b/Workplace/Workplace.csproj index 0d965895f..59fd4ec78 100644 --- a/Workplace/Workplace.csproj +++ b/Workplace/Workplace.csproj @@ -52,8 +52,8 @@ ..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll True - - ..\packages\log4net.2.0.2\lib\net40-full\log4net.dll + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll False diff --git a/Workplace/packages.config b/Workplace/packages.config index fab4a40ce..3af0b93bb 100644 --- a/Workplace/packages.config +++ b/Workplace/packages.config @@ -3,4 +3,5 @@ + \ No newline at end of file