diff --git a/Base/Base.vbproj b/Base/Base.vbproj index dd8a0bcd..841173a1 100644 --- a/Base/Base.vbproj +++ b/Base/Base.vbproj @@ -45,13 +45,7 @@ On - - ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - - ..\packages\NLog.5.0.5\lib\net46\NLog.dll - @@ -138,12 +132,26 @@ My Settings.Designer.vb - - + + + 5.0.5 + + + 6.13.2 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" diff --git a/Config/App.config b/Config/App.config index 7138a761..11b20b81 100644 --- a/Config/App.config +++ b/Config/App.config @@ -17,6 +17,14 @@ + + + + + + + + \ No newline at end of file diff --git a/Config/Config.vbproj b/Config/Config.vbproj index 9739d4f1..1fd5c685 100644 --- a/Config/Config.vbproj +++ b/Config/Config.vbproj @@ -47,16 +47,6 @@ On - - ..\Base\bin\Debug\DigitalData.Modules.Base.dll - - - ..\Database\bin\Debug\DigitalData.Modules.Database.dll - - - False - ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -146,6 +136,20 @@ + + + {6ea0c51f-c2b1-4462-8198-3de0b32b74f8} + Base + + + {eaf0ea75-5fa7-485d-89c7-b2d843b03a96} + Database + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" diff --git a/Database/Adapters/Oracle.vb b/Database/Adapters/Oracle.vb index 7a442e37..7d892b2f 100644 --- a/Database/Adapters/Oracle.vb +++ b/Database/Adapters/Oracle.vb @@ -151,7 +151,7 @@ Public Class Oracle End Try End Function - Public Function GetDatatable(SqlCommand As SqlClient.SqlCommand, Optional Timeout As Integer = 120) As DataTable Implements IDatabase.GetDatatable + Public Function GetDatatable(SqlCommand As System.Data.SqlClient.SqlCommand, Optional Timeout As Integer = 120) As DataTable Implements IDatabase.GetDatatable Throw New NotImplementedException() End Function diff --git a/Database/App.config b/Database/App.config index d354d31f..d13c302b 100644 --- a/Database/App.config +++ b/Database/App.config @@ -1,8 +1,9 @@  - -
+ +
+
@@ -11,13 +12,29 @@ - + + + + + + + + - + + + + + + + + + + \ No newline at end of file diff --git a/Database/Database.vbproj b/Database/Database.vbproj index c2ed2d95..5316818c 100644 --- a/Database/Database.vbproj +++ b/Database/Database.vbproj @@ -47,13 +47,6 @@ On - - ..\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - - False - ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll @@ -66,24 +59,55 @@ ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll + + ..\packages\Oracle.ManagedDataAccess.21.15.0\lib\net462\Oracle.ManagedDataAccess.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll + + ..\packages\System.Formats.Asn1.8.0.0\lib\net462\System.Formats.Asn1.dll + + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.6.0.1\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -150,8 +174,24 @@ My Settings.Designer.vb + + Designer + + + Designer + + + + {8a8f20fc-c46e-41ac-bee7-218366cfff99} + Encryption + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + @@ -159,9 +199,11 @@ + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + \ No newline at end of file diff --git a/Database/Oracle.DataAccess.Common.Configuration.Section.xsd b/Database/Oracle.DataAccess.Common.Configuration.Section.xsd new file mode 100644 index 00000000..eee2d5cf --- /dev/null +++ b/Database/Oracle.DataAccess.Common.Configuration.Section.xsd @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Database/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd b/Database/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd new file mode 100644 index 00000000..70935a1f --- /dev/null +++ b/Database/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Database/packages.config b/Database/packages.config index 84e51e65..ced911c5 100644 --- a/Database/packages.config +++ b/Database/packages.config @@ -3,6 +3,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/EDMIAPI/app.config b/EDMIAPI/app.config index ff29abe3..bee19c2e 100644 --- a/EDMIAPI/app.config +++ b/EDMIAPI/app.config @@ -44,6 +44,14 @@ + + + + + + + + diff --git a/EDMIAPI/packages.config b/EDMIAPI/packages.config index 37cb9210..ce98cd21 100644 --- a/EDMIAPI/packages.config +++ b/EDMIAPI/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Encryption/Encryption.vbproj b/Encryption/Encryption.vbproj index 89d779f0..16be5211 100644 --- a/Encryption/Encryption.vbproj +++ b/Encryption/Encryption.vbproj @@ -45,10 +45,6 @@ On - - False - ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\packages\NLog.5.0.5\lib\net46\NLog.dll @@ -118,5 +114,11 @@ + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + \ No newline at end of file diff --git a/Encryption/packages.config b/Encryption/packages.config index 37cb9210..ce98cd21 100644 --- a/Encryption/packages.config +++ b/Encryption/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/MigrationBackup/56f77a37/Base/Base.vbproj b/MigrationBackup/56f77a37/Base/Base.vbproj new file mode 100644 index 00000000..f5494b99 --- /dev/null +++ b/MigrationBackup/56f77a37/Base/Base.vbproj @@ -0,0 +1,152 @@ + + + + + Debug + AnyCPU + {6EA0C51F-C2B1-4462-8198-3DE0B32B74F8} + Library + DigitalData.Modules.Base + DigitalData.Modules.Base + 512 + Windows + v4.6.2 + true + + + + true + full + true + true + bin\Debug\ + DigitalData.Modules.Base.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + pdbonly + false + true + true + bin\Release\ + DigitalData.Modules.Base.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + + + On + + + Binary + + + Off + + + On + + + + ..\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + + ..\packages\NLog.5.0.5\lib\net46\NLog.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + Application.myapp + True + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + + + + + + + + powershell.exe -command "& { &'$(SolutionDir)copy-binary.ps1' '$(TargetPath)' '$(TargetFileName)' '$(ConfigurationName)' '$(ProjectName)' }" + + \ No newline at end of file diff --git a/MigrationBackup/56f77a37/Base/NuGetUpgradeLog.html b/MigrationBackup/56f77a37/Base/NuGetUpgradeLog.html new file mode 100644 index 00000000..ff69059d --- /dev/null +++ b/MigrationBackup/56f77a37/Base/NuGetUpgradeLog.html @@ -0,0 +1,163 @@ + + + + + NuGetMigrationLog +

+ NuGet Migration Report - Base

Overview

Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.
+ If you run into any problems, have feedback, questions, or concerns, please + file an issue on the NuGet GitHub repository.
+ Changed files and this report have been backed up here: + E:\SchreiberM\Visual Studio\GIT\2_DLL Projekte\DDModules\MigrationBackup\56f77a37\Base
Help me rollback to packages.config

Packages processed

Top-level dependencies:

Package IdVersion
NLog + v5.0.5
NuGet.CommandLine + v6.13.2

Transitive dependencies:

Package IdVersion
+ No transitive dependencies found. +

Package compatibility issues

Description
+ No issues were found. +
\ No newline at end of file diff --git a/Base/packages.config b/MigrationBackup/56f77a37/Base/packages.config similarity index 72% rename from Base/packages.config rename to MigrationBackup/56f77a37/Base/packages.config index 59415cc4..3dca6dcd 100644 --- a/Base/packages.config +++ b/MigrationBackup/56f77a37/Base/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file