Merge branch 'release/1.0.1'

enbrea · Aug 8, 2024 · c51933f · c51933f
2 parents 4808329 + a9a0aa4
commit c51933f
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 
 ## Einführung
 
-Das Enbrea Client Interface (kurz: Enbrea Cli) ist eine plattformunabhängige Konsolenanwendung. Sie erlaubt es, mit einer Enbrea-Instanz von einer lokalen Kommandozeile aus zu kommunizieren.
+Das Enbrea Client Interface (kurz: Enbrea CLI) ist eine plattformunabhängige Konsolenanwendung. Sie erlaubt es, mit einer Enbrea-Instanz von einer lokalen Kommandozeile aus zu kommunizieren.
 
-Enbrea Cli dient administrativen Zwecken und bietet folgende Funktionen:
+Enbrea CLI dient administrativen Zwecken und bietet folgende Funktionen:
 
 + Manueller oder automatisierter Import von Daten aus unterstützten Fachanwendungen nach Enbrea.
 + Manueller oder automatisierter Export von Daten aus Enbrea in unterstützte Fachanwendungen.

diff --git a/setup/Enbrea.Cli.Setup.wixproj b/setup/Enbrea.Cli.Setup.wixproj
@@ -16,7 +16,7 @@
     <SuppressPdbOutput>true</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Netfx.wixext" Version="5.0.0" />
-    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.0" />
+    <PackageReference Include="WixToolset.Netfx.wixext" Version="5.0.1" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.1" />
   </ItemGroup>
 </Project>
diff --git a/setup/Package.de-de.wxl b/setup/Package.de-de.wxl
@@ -3,7 +3,7 @@ This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE">
 
-  <String Id="AppName" Value="Enbrea Cli" />
+  <String Id="AppName" Value="Enbrea CLI" />
   <String Id="AppDescription" Value="Client Tool für die Arbeit mit Enbrea auf der Kommandozeile" />
   <String Id="AppFolder" Value="Enbrea" />
   <String Id="Manufacturer" Value="STÜBER SYSTEMS GmbH" />

diff --git a/setup/Package.en-us.wxl b/setup/Package.en-us.wxl
@@ -3,7 +3,7 @@ This file contains the declaration of all the localizable strings.
 -->
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
 
-  <String Id="AppName" Value="Enbrea Cli" />
+  <String Id="AppName" Value="Enbrea CLI" />
   <String Id="AppDescription" Value="Client Tool for working with Enbrea on the command line" />
   <String Id="AppFolder" Value="Enbrea" />
   <String Id="Manufacturer" Value="STÜBER SYSTEMS GmbH" />

diff --git a/setup/images/app.ico b/setup/images/app.ico
diff --git a/setup/images/app.svg b/setup/images/app.svg
diff --git a/setup/images/bannrbmp.jpg b/setup/images/bannrbmp.jpg
diff --git a/setup/images/dlgbmp.jpg b/setup/images/dlgbmp.jpg
diff --git a/src/Enbrea.Cli.BbsPlanung/Enbrea.Cli.BbsPlanung.csproj b/src/Enbrea.Cli.BbsPlanung/Enbrea.Cli.BbsPlanung.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for BBS-Planung</Product>
+    <Product>Enbrea CLI Module for BBS-Planung</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from a BBS-Planung database</Description>

diff --git a/src/Enbrea.Cli.Common/Enbrea.Cli.Common.csproj b/src/Enbrea.Cli.Common/Enbrea.Cli.Common.csproj
@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Product>Enbrea Cli Common part</Product>
+    <Product>Enbrea CLI Common part</Product>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Authors>STÜBER SYSTEMS GmbH</Authors>
     <Version>0.0.1</Version>
-    <Description>Common Classes and Types for Enbrea Cli</Description>
+    <Description>Common Classes and Types for Enbrea CLI</Description>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Enbrea.Ecf" Version="0.2.1" />
     <PackageReference Include="Enbrea.GuidFactory" Version="0.9.2" />
     <PackageReference Include="Enbrea.Konsoli" Version="0.0.4" />
-    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/src/Enbrea.Cli.DaNiS/Enbrea.Cli.DaNiS.csproj b/src/Enbrea.Cli.DaNiS/Enbrea.Cli.DaNiS.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for edoo.sys</Product>
+    <Product>Enbrea CLI Module for edoo.sys</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from DaNiS</Description>

diff --git a/src/Enbrea.Cli.DaVinci/Enbrea.Cli.DaVinci.csproj b/src/Enbrea.Cli.DaVinci/Enbrea.Cli.DaVinci.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for DAVINCI</Product>
+    <Product>Enbrea CLI Module for DAVINCI</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from DAVINCI and back</Description>

diff --git a/src/Enbrea.Cli.Edoosys/Enbrea.Cli.Edoosys.csproj b/src/Enbrea.Cli.Edoosys/Enbrea.Cli.Edoosys.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for edoo.sys</Product>
+    <Product>Enbrea CLI Module for edoo.sys</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from edoo.sys</Description>

diff --git a/src/Enbrea.Cli.Excel/Enbrea.Cli.Excel.csproj b/src/Enbrea.Cli.Excel/Enbrea.Cli.Excel.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for Excel/CSV</Product>
+    <Product>Enbrea CLI Module for Excel/CSV</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from a simple Excel sheet or CSV</Description>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.102.2" />
+    <PackageReference Include="ClosedXML" Version="0.102.3" />
     <PackageReference Include="Enbrea.Ecf" Version="0.2.1" />
     <PackageReference Include="Enbrea.GuidFactory" Version="0.9.2" />
   </ItemGroup>

diff --git a/src/Enbrea.Cli.Magellan/Enbrea.Cli.Magellan.csproj b/src/Enbrea.Cli.Magellan/Enbrea.Cli.Magellan.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for MAGELLAN</Product>
+    <Product>Enbrea CLI Module for MAGELLAN</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from MAGELLAN and back</Description>

diff --git a/src/Enbrea.Cli.Magellan/Export/ExportManager.cs b/src/Enbrea.Cli.Magellan/Export/ExportManager.cs
@@ -56,7 +56,7 @@ public async override Task Execute()
 
                 if (_version < 7)
                 {
-                    throw new Exception("Enbrea Cli only supports MAGELLAN version 7 and higher.");
+                    throw new Exception("Enbrea CLI only supports MAGELLAN version 7 and higher.");
                 }
 
                 // Report status

diff --git a/src/Enbrea.Cli.Magellan/Import/ImportManager.cs b/src/Enbrea.Cli.Magellan/Import/ImportManager.cs
@@ -76,7 +76,7 @@ public override async Task Execute()
 
                     if (_version < 7)
                     {
-                        throw new Exception("Enbrea Cli only supports MAGELLAN version 7 and higher.");
+                        throw new Exception("Enbrea CLI only supports MAGELLAN version 7 and higher.");
                     }
 
                     // Report status

diff --git a/src/Enbrea.Cli.SchildNRW/Enbrea.Cli.SchildNRW.csproj b/src/Enbrea.Cli.SchildNRW/Enbrea.Cli.SchildNRW.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for SchildNRW</Product>
+    <Product>Enbrea CLI Module for SchildNRW</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from SchildNRW</Description>

diff --git a/src/Enbrea.Cli.Untis/Enbrea.Cli.Untis.csproj b/src/Enbrea.Cli.Untis/Enbrea.Cli.Untis.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli Module for Untis</Product>
+    <Product>Enbrea CLI Module for Untis</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>0.0.1</Version>
     <Description>Generating ECF files from Untis</Description>

diff --git a/src/Enbrea.Cli/Configuration/Configuration.cs b/src/Enbrea.Cli/Configuration/Configuration.cs
@@ -26,7 +26,7 @@
 namespace Enbrea.Cli
 {
     /// <summary>
-    /// Enbrea Cli configuration
+    /// Enbrea CLI configuration
     /// </summary>
     public class Configuration
     {

diff --git a/src/Enbrea.Cli/Enbrea.Cli.csproj b/src/Enbrea.Cli/Enbrea.Cli.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>© 2024 STÜBER SYSTEMS GmbH</Copyright>
-    <Product>Enbrea Cli</Product>
+    <Product>Enbrea CLI</Product>
     <Company>STÜBER SYSTEMS GmbH</Company>
     <Version>1.0.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -20,17 +20,17 @@
     <PackageReference Include="Enbrea.Csv" Version="0.10.2" />
     <PackageReference Include="Enbrea.Ecf" Version="0.2.1" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.7" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.7" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Serilog" Version="4.0.0" />
+    <PackageReference Include="Serilog" Version="4.0.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="TaskScheduler" Version="2.11.0" />
   </ItemGroup>
 

diff --git a/src/Enbrea.Cli/Schedules/ScheduleManager.cs b/src/Enbrea.Cli/Schedules/ScheduleManager.cs
@@ -72,7 +72,7 @@ public void CreateExportTask(string configFile, Configuration config, ExportProv
 
                     var weekTrigger = new WeeklyTrigger
                     {
-                        StartBoundary = DateTime.Now,
+                        StartBoundary = DateTime.Now.AddSeconds(15),
                         DaysOfWeek = DaysOfTheWeek.AllDays,
                         WeeksInterval = 1
                     };
@@ -134,7 +134,7 @@ public void CreateImportTask(string configFile, Configuration config, ImportProv
 
                     var weekTrigger = new WeeklyTrigger
                     {
-                        StartBoundary = DateTime.Now,
+                        StartBoundary = DateTime.Now.AddSeconds(15),
                         DaysOfWeek = DaysOfTheWeek.AllDays,
                         WeeksInterval = 1
                     };
@@ -373,6 +373,11 @@ public void EnableExportTask(ExportProvider provider)
 
                     if (task != null)
                     {
+                        if (task.Definition.Triggers.Count > 0)
+                        {
+                            task.Definition.Triggers[0].StartBoundary = DateTime.Now.AddSeconds(15);
+                        }
+
                         task.Definition.Settings.Enabled = true;
                         task.RegisterChanges();
 
@@ -408,6 +413,11 @@ public void EnableImportTask(ImportProvider provider)
 
                     if (task != null)
                     {
+                        if (task.Definition.Triggers.Count > 0)
+                        {
+                            task.Definition.Triggers[0].StartBoundary = DateTime.Now.AddSeconds(15);
+                        }
+
                         task.Definition.Settings.Enabled = true;
                         task.RegisterChanges();