From 8d01c153965b467f228ed7323697609648a4990a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 9 Mar 2023 07:47:40 +0100
Subject: [PATCH] Increase Library version, corrected IMDG validation

---
 ENI2/ENI2.csproj                              | 14 +++---
 ENI2/packages.config                          |  8 ++--
 .../SendNSWMessageService.csproj              |  4 +-
 SendNSWMessageService/packages.config         |  2 +-
 .../bsmd.LockingService.csproj                |  4 +-
 bsmd.LockingService/packages.config           |  2 +-
 bsmd.dakosy/bsmd.dakosy.csproj                |  4 +-
 bsmd.dakosy/packages.config                   |  2 +-
 bsmd.database/IMDGPosition.cs                 | 48 +++++++++++--------
 bsmd.database/bsmd.database.csproj            |  6 +--
 bsmd.database/packages.config                 |  4 +-
 bsmd.dbh/bsmd.dbh.csproj                      |  4 +-
 bsmd.dbh/packages.config                      |  2 +-
 bsmd.hisnord/bsmd.hisnord.csproj              |  4 +-
 bsmd.hisnord/packages.config                  |  2 +-
 bsmd.status/bsmd.status.csproj                |  4 +-
 bsmd.status/packages.config                   |  2 +-
 17 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 88c5baf4..eb3ae775 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -137,11 +137,11 @@
     <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
       <HintPath>packages\ExcelDataReader.3.6.0\lib\net45\ExcelDataReader.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
+      <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="MigraDoc.DocumentObjectModel-gdi, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
@@ -162,8 +162,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.SQLite, Version=1.0.115.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.117.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\lib\net46\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
@@ -1009,12 +1009,12 @@
   <PropertyGroup>
     <PostBuildEvent>"$(SignToolPath)signtool.exe" sign /f $(ProjectDir)\..\misc\codesigning.pfx /p t5bj2dk9ifdIWBPhPra4U $(TargetPath)</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
+  <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.115.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
+    <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.117.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ENI2/packages.config b/ENI2/packages.config
index 8168394a..df7518bd 100644
--- a/ENI2/packages.config
+++ b/ENI2/packages.config
@@ -5,9 +5,9 @@ Sample license text.
 <packages>
   <package id="ExcelDataReader" version="3.6.0" targetFramework="net452" />
   <package id="Extended.Wpf.Toolkit" version="4.3.0" targetFramework="net48" />
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
-  <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
+  <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net48" />
   <package id="PDFsharp-MigraDoc-gdi" version="1.50.5147" targetFramework="net452" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.115.0" targetFramework="net48" />
-  <package id="System.Data.SQLite.Core" version="1.0.115.0" targetFramework="net48" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.117.0" targetFramework="net48" />
+  <package id="System.Data.SQLite.Core" version="1.0.117.0" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/SendNSWMessageService/SendNSWMessageService.csproj b/SendNSWMessageService/SendNSWMessageService.csproj
index 00464ad5..9442f95b 100644
--- a/SendNSWMessageService/SendNSWMessageService.csproj
+++ b/SendNSWMessageService/SendNSWMessageService.csproj
@@ -40,8 +40,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/SendNSWMessageService/packages.config b/SendNSWMessageService/packages.config
index e788d34b..f0d1ef42 100644
--- a/SendNSWMessageService/packages.config
+++ b/SendNSWMessageService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.LockingService/bsmd.LockingService.csproj b/bsmd.LockingService/bsmd.LockingService.csproj
index 500d1cbb..f674fb54 100644
--- a/bsmd.LockingService/bsmd.LockingService.csproj
+++ b/bsmd.LockingService/bsmd.LockingService.csproj
@@ -46,8 +46,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\ENI2\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/bsmd.LockingService/packages.config b/bsmd.LockingService/packages.config
index e788d34b..f0d1ef42 100644
--- a/bsmd.LockingService/packages.config
+++ b/bsmd.LockingService/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dakosy/bsmd.dakosy.csproj b/bsmd.dakosy/bsmd.dakosy.csproj
index 0e60226a..d6f74276 100644
--- a/bsmd.dakosy/bsmd.dakosy.csproj
+++ b/bsmd.dakosy/bsmd.dakosy.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.dakosy/packages.config b/bsmd.dakosy/packages.config
index e788d34b..f0d1ef42 100644
--- a/bsmd.dakosy/packages.config
+++ b/bsmd.dakosy/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.database/IMDGPosition.cs b/bsmd.database/IMDGPosition.cs
index 6f78d97a..2243f0b7 100644
--- a/bsmd.database/IMDGPosition.cs
+++ b/bsmd.database/IMDGPosition.cs
@@ -159,7 +159,6 @@ namespace bsmd.database
         public string VehicleLicenseNumber { get; set; }
 
         [ShowReport]
-        [Validation(ValidationCode.NOT_NULL)]
         [MaxLength(24)]
         [ENI2Validation]
         [MaxWordLength(9)]
@@ -515,30 +514,39 @@ namespace bsmd.database
                     errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "IMOClass", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
             }
 
-            if(!this.Bay.IsNullOrEmpty())
+            if (!this.StowagePosition.IsNullOrEmpty() && (!this.Bay.IsNullOrEmpty() || !this.Row.IsNullOrEmpty() || !this.Tier.IsNullOrEmpty()))
             {
-                const string pattern = @"^[0-9]{3}$";
-                Regex regex = new Regex(pattern);
-                if (!regex.IsMatch(this.Bay))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Bay", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "StowagePosition AND Bay/Row/Tier SET", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
             }
-
-            if(!this.Row.IsNullOrEmpty())
+            else
             {
-                const string pattern = @"^[0-9]{2}$";
-                Regex regex = new Regex(pattern);
-                if (!regex.IsMatch(this.Row))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Row", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
-            }
+                if (StowagePosition.IsNullOrEmpty())
+                {
+                    if (!this.Bay.IsNullOrEmpty())
+                    {
+                        const string pattern = @"^[0-9]{3}$";
+                        Regex regex = new Regex(pattern);
+                        if (!regex.IsMatch(this.Bay))
+                            errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Bay", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                    }
 
-            if(!this.Tier.IsNullOrEmpty())
-            {
-                const string pattern = @"^[0-9]{2}$";
-                Regex regex = new Regex(pattern);
-                if (!regex.IsMatch(this.Tier))
-                    errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Tier", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
-            }
+                    if (!this.Row.IsNullOrEmpty())
+                    {
+                        const string pattern = @"^[0-9]{2}$";
+                        Regex regex = new Regex(pattern);
+                        if (!regex.IsMatch(this.Row))
+                            errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Row", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                    }
 
+                    if (!this.Tier.IsNullOrEmpty())
+                    {
+                        const string pattern = @"^[0-9]{2}$";
+                        Regex regex = new Regex(pattern);
+                        if (!regex.IsMatch(this.Tier))
+                            errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, "Tier", null, this.Title, this.Identifier, this.HAZ.IsDeparture ? "HAZD" : "HAZA"));
+                    }
+                }
+            }
         }
 
         #endregion
diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj
index 2c2d57c7..fef81742 100644
--- a/bsmd.database/bsmd.database.csproj
+++ b/bsmd.database/bsmd.database.csproj
@@ -83,11 +83,11 @@
     <CodeAnalysisRuleSet>..\code.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\ENI2\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
diff --git a/bsmd.database/packages.config b/bsmd.database/packages.config
index c16deb5a..5360e337 100644
--- a/bsmd.database/packages.config
+++ b/bsmd.database/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.dbh/bsmd.dbh.csproj b/bsmd.dbh/bsmd.dbh.csproj
index 1a8305f3..d39d69af 100644
--- a/bsmd.dbh/bsmd.dbh.csproj
+++ b/bsmd.dbh/bsmd.dbh.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.dbh/packages.config b/bsmd.dbh/packages.config
index e788d34b..f0d1ef42 100644
--- a/bsmd.dbh/packages.config
+++ b/bsmd.dbh/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.hisnord/bsmd.hisnord.csproj b/bsmd.hisnord/bsmd.hisnord.csproj
index a61b8cb5..f9e0cbc7 100644
--- a/bsmd.hisnord/bsmd.hisnord.csproj
+++ b/bsmd.hisnord/bsmd.hisnord.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.hisnord/packages.config b/bsmd.hisnord/packages.config
index e788d34b..f0d1ef42 100644
--- a/bsmd.hisnord/packages.config
+++ b/bsmd.hisnord/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file
diff --git a/bsmd.status/bsmd.status.csproj b/bsmd.status/bsmd.status.csproj
index d999c9aa..4066a5e7 100644
--- a/bsmd.status/bsmd.status.csproj
+++ b/bsmd.status/bsmd.status.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\bsmdKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/bsmd.status/packages.config b/bsmd.status/packages.config
index e788d34b..f0d1ef42 100644
--- a/bsmd.status/packages.config
+++ b/bsmd.status/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net48" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
 </packages>
\ No newline at end of file