upgrade packages versions

koozala · Nov 10, 2024 · 2a3593f · 2a3593f
1 parent 9f4376f
commit 2a3593f
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 21 deletions.
diff --git a/installer/pacioli_installer.iss b/installer/pacioli_installer.iss
@@ -5,7 +5,7 @@
 #define MyAppVersion "v0.4-alpha"
 #define MyAppPublisher "koozala"
 #define MyAppURL "https://github.com/koozala/pacioli"
-#define MyAppExeName "Pacioli.WindowsApp.NET8.exe"
+#define MyAppExeName "Pacioli.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
@@ -69,6 +69,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "S:\wrk\Projekte\RechPdf\Pacioli.NET.Selfcontained\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
 Source: "S:\wrk\Projekte\RechPdf\Pacioli.NET.Selfcontained\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "S:\wrk\Projekte\RechPdf\Pacioli.Commandline\PacioliC.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "S:\wrk\Projekte\RechPdf\Pacioli.Commandline\PacioliC.dll"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]

diff --git a/src/Pacioli.Config.Persistence.Test/Pacioli.Config.Persistence.Test.csproj b/src/Pacioli.Config.Persistence.Test/Pacioli.Config.Persistence.Test.csproj
@@ -10,11 +10,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Pacioli.Config.Persistence.Test/UnitTest1.cs b/src/Pacioli.Config.Persistence.Test/UnitTest1.cs
@@ -17,7 +17,7 @@ public void Test1()
             pref.OpenAfterSave = false;
             configDb.SavePreferences(pref);
             pref = configDb.ReadPreferences();
-            Assert.IsFalse(pref.OpenAfterSave);
+            Assert.That(pref.OpenAfterSave, Is.False);
         }
     }
 }
diff --git a/src/Pacioli.Language/Resources/Resources.Designer.cs b/src/Pacioli.Language/Resources/Resources.Designer.cs
diff --git a/src/Pacioli.Language/Resources/Resources.en.resx b/src/Pacioli.Language/Resources/Resources.en.resx
@@ -300,4 +300,7 @@
   <data name="refOrder" xml:space="preserve">
     <value>Order reference</value>
   </data>
+  <data name="days" xml:space="preserve">
+    <value>Days</value>
+  </data>
 </root>
diff --git a/src/Pacioli.Language/Resources/Resources.resx b/src/Pacioli.Language/Resources/Resources.resx
@@ -300,4 +300,7 @@
   <data name="refOrder" xml:space="preserve">
     <value>Bestellreferenz</value>
   </data>
+  <data name="days" xml:space="preserve">
+    <value>Tage</value>
+  </data>
 </root>
diff --git a/src/Pacioli.Pdf/Invoice/InvoiceWriter.cs b/src/Pacioli.Pdf/Invoice/InvoiceWriter.cs
@@ -64,7 +64,7 @@ public InvoiceWriter(Stream data, string? _attachmentsTargetPath)
 
         public int CountAttachments()
         {
-            return descriptor.TradeLineItems.Sum(x => x.AdditionalReferencedDocuments.Count);
+            return descriptor.TradeLineItems.Sum(x => x.GetAdditionalReferencedDocuments().Count);
         }
 
         public void Write(string outputFileName)
@@ -294,9 +294,9 @@ public void Write(string outputFileName)
 
             foreach (var item in descriptor.TradeLineItems)
             {
-                if (item.AdditionalReferencedDocuments.Count > 0)
+                if (item.GetAdditionalReferencedDocuments().Count > 0)
                 {
-                    foreach (var refdoc in item.AdditionalReferencedDocuments)
+                    foreach (var refdoc in item.GetAdditionalReferencedDocuments())
                     {
                         if (attachmentsTargetPath != null)
                         {
@@ -388,16 +388,20 @@ public void Write(string outputFileName)
                 doc.Add(new Paragraph($"{descriptor.BuyerElectronicAddress.ElectronicAddressSchemeID} {descriptor.BuyerElectronicAddress.Address}"));
             }
 
-            var pt = descriptor.PaymentTerms;
-            if (pt != null)
+            var pts = descriptor.GetTradePaymentTerms();
+            if (pts != null)
             {
-                StringBuilder sb = new StringBuilder();
-                if (!string.IsNullOrWhiteSpace(pt.Description)) sb.Append(pt.Description);
-                if (pt.DueDate.HasValue) sb.Append($"\n{Resources.dueDate}: {pt.DueDate.Value.ToString("d")}");
-                if (sb.Length > 0)
+                foreach (var pt in pts)
                 {
-                    var tbox = new PartyBox($"{Resources.dueDate}", sb.ToString());
-                    doc.Add(tbox);
+                    StringBuilder sb = new StringBuilder();
+                    if (!string.IsNullOrWhiteSpace(pt.Description)) sb.Append(pt.Description);
+                    if (pt.DueDate.HasValue) sb.Append($"\n{Resources.dueDate}: {pt.DueDate.Value.ToString("d")}");
+                    if (pt.DueDays.HasValue) sb.Append($"\n{Resources.dueDate}: {pt.DueDays.Value} {Resources.days}");
+                    if (sb.Length > 0)
+                    {
+                        var tbox = new PartyBox($"{Resources.dueDate}", sb.ToString());
+                        doc.Add(tbox);
+                    }
                 }
             }
 

diff --git a/src/Pacioli.Pdf/Pacioli.Pdf.csproj b/src/Pacioli.Pdf/Pacioli.Pdf.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="itext" Version="8.0.5" />
     <PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.5" />
-    <PackageReference Include="ZUGFeRD-csharp" Version="14.1.0" />
+    <PackageReference Include="ZUGFeRD-csharp" Version="15.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Pacioli.Preview/Pacioli.Preview.csproj b/src/Pacioli.Preview/Pacioli.Preview.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PDFtoImage" Version="4.1.0" />
+    <PackageReference Include="PDFtoImage" Version="4.1.1" />
     <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/src/Pacioli.WindowsApp.NET8/Pacioli.WindowsApp.NET8.csproj b/src/Pacioli.WindowsApp.NET8/Pacioli.WindowsApp.NET8.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0-rc.2.24474.1" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
   </ItemGroup>
 
   <ItemGroup>