Version 1.18.1

audiamus · Mar 5, 2023 · 3fdae89 · 3fdae89
1 parent 4f409c0
commit 3fdae89
Show file tree

Hide file tree

Showing 15 changed files with 679 additions and 554 deletions.
diff --git a/README.md b/README.md
@@ -51,15 +51,15 @@ The application requires .Net Framework 4.8 to be installed. On Windows 10/11 sy
 AAX Audio Converter is configured to support high DPI monitors under Windows 10. It will scale properly when the user changes the DPI or scale factor. 
 
 ## Download
-Windows setup package version 1.18, English and German, with manuals, plus FFmpeg executable:
+Windows setup package version 1.18.1, English and German, with manuals, plus FFmpeg executable:
 
-**[AaxAudioConverter-1.18-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18/AaxAudioConverter-1.18-Setup.exe)**
+**[AaxAudioConverter-1.18.1-Setup.exe](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe)**
 
 Manuals (also included in the setup package):
 
-**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18/AaxAudioConverter.pdf)**
+**[English](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter.pdf)**
 
-**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18/AaxAudioConverter.de.pdf)**
+**[German](https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter.de.pdf)**
 
 
 ## Dependencies

diff --git a/res/Setup.dat b/res/Setup.dat
@@ -1,2 +1,2 @@
-https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18/AaxAudioConverter-1.18-Setup.exe
-MD5: 39ce1f60c41e24478857dd7886d07e21
+https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe
+MD5: 2757398570df456f8d9cdd4f88687498
diff --git a/res/Setup.json b/res/Setup.json
@@ -1,11 +1,11 @@
 [
   {
-    "Url": "https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18/AaxAudioConverter-1.18-Setup.exe",
+    "Url": "https://github.com/audiamus/AaxAudioConverter/releases/download/v1.18.1/AaxAudioConverter-1.18.1-Setup.exe",
     "AppName": "AaxAudioConverter",
-    "Version": "1.18",
+    "Version": "1.18.1",
     "Preview": false,
     "Descript": null,
-    "Md5": "39ce1f60c41e24478857dd7886d07e21"
+    "Md5": "2757398570df456f8d9cdd4f88687498"
   },
   {
     "AppName": "BookLibConnect",

diff --git a/src/AaxAudioConverter/AaxAudioConverter.de.odt b/src/AaxAudioConverter/AaxAudioConverter.de.odt
diff --git a/src/AaxAudioConverter/AaxAudioConverter.latest.de.rtf b/src/AaxAudioConverter/AaxAudioConverter.latest.de.rtf
diff --git a/src/AaxAudioConverter/AaxAudioConverter.latest.rtf b/src/AaxAudioConverter/AaxAudioConverter.latest.rtf
diff --git a/src/AaxAudioConverter/AaxAudioConverter.odt b/src/AaxAudioConverter/AaxAudioConverter.odt
diff --git a/src/AaxAudioConverter/App.config b/src/AaxAudioConverter/App.config
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="audiamus.aaxconv.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+      <section name="audiamus.aaxconv.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="audiamus.aaxconv.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+      <section name="audiamus.aaxconv.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
 
   <System.Windows.Forms.ApplicationConfigurationSection>
-    <add key="DpiAwareness" value="PerMonitorV2"/>
+    <add key="DpiAwareness" value="PerMonitorV2" />
   </System.Windows.Forms.ApplicationConfigurationSection>
 
   <userSettings>
@@ -195,4 +195,12 @@
       </setting>
     </audiamus.aaxconv.Properties.Settings>
   </applicationSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/src/AaxAudioConverter/Properties/AssemblyInfo.cs b/src/AaxAudioConverter/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.18.0.0")]
-[assembly: AssemblyFileVersion ("1.18.0.0")]
+[assembly: AssemblyVersion ("1.18.1.0")]
+[assembly: AssemblyFileVersion ("1.18.1.0")]
 [assembly: NeutralResourcesLanguage ("en")]
 
diff --git a/src/AaxAudioConverterLib/AaxAudioConverterLib.csproj b/src/AaxAudioConverterLib/AaxAudioConverterLib.csproj
@@ -34,16 +34,16 @@
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ATL, Version=4.17.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\z440.atl.core.4.17.0\lib\net48\ATL.dll</HintPath>
+    <Reference Include="ATL, Version=4.20.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\z440.atl.core.4.20.0\lib\net48\ATL.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -116,6 +116,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/src/AaxAudioConverterLib/Properties/AssemblyInfo.cs b/src/AaxAudioConverterLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion ("1.18.0.0")]
-[assembly: AssemblyFileVersion ("1.18.0.0")]
+[assembly: AssemblyVersion ("1.18.1.0")]
+[assembly: AssemblyFileVersion ("1.18.1.0")]
diff --git a/src/AaxAudioConverterLib/TagAndFileNamingHelper.cs b/src/AaxAudioConverterLib/TagAndFileNamingHelper.cs
@@ -585,8 +585,14 @@ private bool readMetadataAtlAax () {
         afi.Genre = tags.Genre?.Decode ().SplitTrim ().FirstOrDefault ();
 
         afi.Narrators = atlCustomTag (tags, NRT).Decode ().SplitTrim ();
-        afi.Abstract = atlCustomTag (tags, DES).Decode ();
-        afi.Publisher = atlCustomTag (tags, PUB).Decode ();
+
+        afi.Abstract = tags.Description?.Decode ();
+        if (afi.Abstract.IsNullOrWhiteSpace ())
+          afi.Abstract = atlCustomTag (tags, DES).Decode ();
+
+        afi.Publisher = tags.Publisher?.Decode ();
+        if (afi.Publisher.IsNullOrWhiteSpace ())
+          afi.Publisher = atlCustomTag (tags, PUB).Decode ();
 
 #if MULTIPART_TEST
         {

diff --git a/src/AaxAudioConverterLib/app.config b/src/AaxAudioConverterLib/app.config
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/AaxAudioConverterLib/packages.config b/src/AaxAudioConverterLib/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="Ude.NetStandard" version="1.2.0" targetFramework="net48" />
-  <package id="z440.atl.core" version="4.17.0" targetFramework="net48" />
+  <package id="z440.atl.core" version="4.20.0" targetFramework="net48" />
 </packages>
diff --git a/src/InnoSetup/AaxAudioConverter setup.iss b/src/InnoSetup/AaxAudioConverter setup.iss
@@ -1,5 +1,5 @@
 #define MyAppSetupName 'AAX Audio Converter'
-#define MyAppVersion '1.18'
+#define MyAppVersion '1.18.1'
 #define MyProgramExe = 'AaxAudioConverter.exe'
 #define MyCompany = 'audiamus'
 #define MyAppName = 'AaxAudioConverter'