From c5bfc505d83247da41a17c50e18513355b27990f Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 29 Dec 2024 10:22:53 +0100 Subject: [PATCH] Version bump and library updates --- ENI2/App.config | 14 +++- ENI2/CustomCommands.cs | 3 +- ENI2/ENI2.csproj | 67 ++++++++++--------- .../ILLink.Descriptors.LibraryBuild.xml | 8 +++ ENI2/packages.config | 32 ++++----- .../Properties/AssemblyProductInfo.cs | 4 +- .../Properties/AssemblyProjectInfo.cs | 2 +- 7 files changed, 73 insertions(+), 57 deletions(-) create mode 100644 ENI2/ILLink/ILLink.Descriptors.LibraryBuild.xml diff --git a/ENI2/App.config b/ENI2/App.config index 3493f0f7..ef47ee44 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -85,15 +85,23 @@ - + - + - + + + + + + + + + diff --git a/ENI2/CustomCommands.cs b/ENI2/CustomCommands.cs index c52eac19..41d0bc04 100644 --- a/ENI2/CustomCommands.cs +++ b/ENI2/CustomCommands.cs @@ -34,8 +34,7 @@ namespace ENI2 if (parentObject == null) return null; //check if the parent matches the type we're looking for - T parent = parentObject as T; - if (parent != null) + if (parentObject is T parent) return parent; else return FindParent(parentObject); diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 4c54f12b..37978d51 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -37,7 +37,7 @@ true publish.html 3 - 7.2.5.3 + 7.2.6.0 false true true @@ -137,29 +137,29 @@ packages\ExcelDataReader.3.7.0\lib\net462\ExcelDataReader.dll - - packages\log4net.3.0.1\lib\net462\log4net.dll + + packages\log4net.3.0.3\lib\net462\log4net.dll - - packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - packages\Microsoft.Extensions.DependencyInjection.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + packages\Microsoft.Extensions.DependencyInjection.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll - - packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - packages\Microsoft.Extensions.Logging.8.0.1\lib\net462\Microsoft.Extensions.Logging.dll + + packages\Microsoft.Extensions.Logging.9.0.0\lib\net462\Microsoft.Extensions.Logging.dll - - packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll + + packages\Microsoft.Extensions.Logging.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll + + packages\Microsoft.Extensions.Options.9.0.0\lib\net462\Microsoft.Extensions.Options.dll - - packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + packages\Microsoft.Extensions.Primitives.9.0.0\lib\net462\Microsoft.Extensions.Primitives.dll packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll @@ -193,36 +193,36 @@ packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.WPFonts.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Buffers.dll + + packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll + + packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll - - packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Numerics.Vectors.dll + + packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Threading.Tasks.Extensions.dll + + packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.ValueTuple.dll @@ -933,6 +933,7 @@ + Always @@ -1084,12 +1085,12 @@ "$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\ENI2_6_TemporaryKey.pfx /p FgrMFUWsTVGQeb6L6i0e /fd SHA256 $(TargetPath) - + 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}. - + + + + + diff --git a/ENI2/packages.config b/ENI2/packages.config index 1efc695f..28b9df1f 100644 --- a/ENI2/packages.config +++ b/ENI2/packages.config @@ -5,23 +5,23 @@ Sample license text. - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index 61cfd89a..fced6f80 100644 --- a/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("7.2.5")] -[assembly: AssemblyCopyright("Copyright © 2014-2024 schick Informatik")] +[assembly: AssemblyInformationalVersion("7.2.6")] +[assembly: AssemblyCopyright("Copyright © 2014-2025 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs index 2d216e85..3521bcaa 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("7.2.5.*")] +[assembly: AssemblyVersion("7.2.6.*")]