From be46e79a6725ea81747bfd7be895a4bc6e358be0 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 5 Dec 2024 18:46:04 +0100
Subject: [PATCH] Cosmetics and bumped version to 1.7.0.0

---
 misc/BreCalApi.yaml                           |  2 +-
 misc/version.txt                              |  2 +-
 src/BreCalClient/BreCalClient.csproj          |  4 +-
 src/BreCalClient/MainWindow.xaml.cs           |  2 +-
 .../ClickOnceDevelProfile.pubxml              |  4 +-
 src/BreCalClient/Resources/Resources.de.resx  | 99 +++++--------------
 src/RoleEditor/RoleEditor.csproj              |  4 +-
 src/server/setup.py                           |  2 +-
 8 files changed, 37 insertions(+), 82 deletions(-)

diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 49e7fc6..e873d8f 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 x-stoplight:
   id: mwv4y8vcnopwr
 info:
-  version: 1.6.0
+  version: 1.7.0
   title: Bremen calling API
   description: 'Administer DEBRE ship calls, times and notifications'
   termsOfService: 'https://www.bsmd.de/'
diff --git a/misc/version.txt b/misc/version.txt
index 0e7d833..1f0cf6b 100644
--- a/misc/version.txt
+++ b/misc/version.txt
@@ -1 +1 @@
-1.6.0.4
\ No newline at end of file
+1.7.0.0
\ No newline at end of file
diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index f2f3420..1493944 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.6.0.4</AssemblyVersion>
-    <FileVersion>1.6.0.4</FileVersion>
+    <AssemblyVersion>1.7.0.0</AssemblyVersion>
+    <FileVersion>1.7.0.0</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index f2698ff..cb0056b 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -401,7 +401,7 @@ namespace BreCalClient
         {
             this.searchFilterControl.SearchFilter.Ports.Clear();
 
-            List<Berth> berths = new List<Berth>();
+            List<Berth> berths = new();
             foreach (Port port in comboBoxPorts.SelectedItems)
             {
                 this.searchFilterControl.SearchFilter.Ports.Add(port.Id);
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index b01f18b..3747c9b 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>1.6.0.4</ApplicationVersion>
+    <ApplicationVersion>1.7.0.0</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
@@ -38,7 +38,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <UpdateMode>Foreground</UpdateMode>
     <UpdateRequired>True</UpdateRequired>
     <WebPageFileName>Publish.html</WebPageFileName>
-    <MinimumRequiredVersion>1.6.0.4</MinimumRequiredVersion>
+    <MinimumRequiredVersion>1.7.0.0</MinimumRequiredVersion>
     <SkipPublishVerification>false</SkipPublishVerification>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index be0f11e..183f264 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -547,51 +547,6 @@
   <data name="arrow_up_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>arrow_up_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="textShiftingSequence" xml:space="preserve">
-    <value>Verhol. Nr.</value>
-  </data>
-  <data name="textClearAll" xml:space="preserve">
-    <value>Alle Eintragungen zurücksetzen?</value>
-  </data>
-  <data name="textBothTideTimesNecessary" xml:space="preserve">
-    <value>Beide Tidenzeiten sollten angegeben werden (von - bis)</value>
-  </data>
-  <data name="textEndValueBeforeStartValue" xml:space="preserve">
-    <value>Endzeit liegt vor Startzeit</value>
-  </data>
-  <data name="textError" xml:space="preserve">
-    <value>Error</value>
-  </data>
-  <data name="textETAInThePast" xml:space="preserve">
-    <value>Zeitpunkt ETA liegt in der Vergangenheit</value>
-  </data>
-  <data name="textETDInThePast" xml:space="preserve">
-    <value>Zeitpunkt ETD liegt in der Vergangenheit</value>
-  </data>
-  <data name="textLockTimeInThePast" xml:space="preserve">
-    <value>Schleusenzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textOperationEndInThePast" xml:space="preserve">
-    <value>Operation Endzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textOperationStartInThePast" xml:space="preserve">
-    <value>Operation Startzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textTideTimesInThePast" xml:space="preserve">
-    <value>Tidenzeit liegt in der Vergangenheit</value>
-  </data>
-  <data name="textWarning" xml:space="preserve">
-    <value>Warnung</value>
-  </data>
-  <data name="textZoneEntryInThePast" xml:space="preserve">
-    <value>Zeit Reviereintritt liegt in der Vergangenheit</value>
-  </data>
-  <data name="textTidalBothValues" xml:space="preserve">
-    <value>Für das Tidenfenster müssen beide Zeiten angegeben werden</value>
-  </data>
-	<data name="textTooFarInTheFuture" xml:space="preserve">
-    <value>Eine Zeiteingabe ist zu weit in der Zukunft</value>
-  </data>
   <data name="textStartTimeMissing" xml:space="preserve">
     <value>Wenn eine Ende-Zeit angegeben wird, muss auch eine Start-Zeit angegeben werden</value>
   </data>
diff --git a/src/RoleEditor/RoleEditor.csproj b/src/RoleEditor/RoleEditor.csproj
index 9940677..abda60e 100644
--- a/src/RoleEditor/RoleEditor.csproj
+++ b/src/RoleEditor/RoleEditor.csproj
@@ -6,8 +6,8 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\lock_preferences.ico</ApplicationIcon>
-    <FileVersion>1.6.0.4</FileVersion>
-    <AssemblyVersion>1.6.0.4</AssemblyVersion>
+    <FileVersion>1.7.0.0</FileVersion>
+    <AssemblyVersion>1.7.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/server/setup.py b/src/server/setup.py
index 30698c0..a9cbeb1 100644
--- a/src/server/setup.py
+++ b/src/server/setup.py
@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='BreCal',
-    version='1.6.0',
+    version='1.7.0',
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,