version update to 2.9.1

daisy · Dec 19, 2024 · 212d28b · 212d28b
1 parent f03bf5c
commit 212d28b
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 86 deletions.
diff --git a/Common/DaisyAddinLib/Controls/EnumControl.resx b/Common/DaisyAddinLib/Controls/EnumControl.resx
@@ -181,6 +181,6 @@
     <value>EnumControl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.0.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
+    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.1.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
   </data>
 </root>
diff --git a/Common/DaisyAddinLib/Controls/StrUserControl.resx b/Common/DaisyAddinLib/Controls/StrUserControl.resx
@@ -211,6 +211,6 @@
     <value>StrUserControl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.0.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
+    <value>Daisy.SaveAsDAISY.Forms.Controls.BaseUserControl, DaisyAddinLib, Version=2.9.1.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
   </data>
 </root>
diff --git a/Common/DaisyAddinLib/ConversionParametersForm.resx b/Common/DaisyAddinLib/ConversionParametersForm.resx
@@ -909,7 +909,7 @@ your document with the Word Accessibility Checker.
     <value>DestinationControl</value>
   </data>
   <data name="&gt;&gt;DestinationControl.Type" xml:space="preserve">
-    <value>Daisy.SaveAsDAISY.Forms.Controls.PathControl, DaisyAddinLib, Version=2.9.0.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
+    <value>Daisy.SaveAsDAISY.Forms.Controls.PathControl, DaisyAddinLib, Version=2.9.1.0, Culture=neutral, PublicKeyToken=b32eb409b38936d8</value>
   </data>
   <data name="&gt;&gt;DestinationControl.Parent" xml:space="preserve">
     <value>$this</value>

diff --git a/Common/DaisyAddinLib/Properties/AssemblyInfo.cs b/Common/DaisyAddinLib/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@
 //
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de révision et de build par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
diff --git a/Common/DaisyConverterLib/Properties/AssemblyInfo.cs b/Common/DaisyConverterLib/Properties/AssemblyInfo.cs
@@ -57,5 +57,5 @@
 //      Numéro de build
 //      Révision
 //
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
diff --git a/Installer/CustomActionAddin/Properties/AssemblyInfo.cs b/Installer/CustomActionAddin/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
diff --git a/Installer/DaisyAddinForWordSetup/Product.wxs b/Installer/DaisyAddinForWordSetup/Product.wxs
diff --git a/Installer/SaveAsDAISYInstaller/Properties/AssemblyInfo.cs b/Installer/SaveAsDAISYInstaller/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("2.9.0.0")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
diff --git a/Installer/SaveAsDAISYInstaller/SaveAsDAISYInstaller.csproj b/Installer/SaveAsDAISYInstaller/SaveAsDAISYInstaller.csproj
@@ -31,7 +31,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.9.0.%2a</ApplicationVersion>
+    <ApplicationVersion>2.9.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>

diff --git a/WordAddIn/AssemblyInfo.cs b/WordAddIn/AssemblyInfo.cs
@@ -26,7 +26,7 @@
 // You can specify all the value or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.9.0.0")]
+[assembly: AssemblyVersion("2.9.1.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -49,4 +49,4 @@
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
-[assembly: AssemblyFileVersion("2.9.0.0")]
+[assembly: AssemblyFileVersion("2.9.1.0")]
diff --git a/build.ps1 b/build.ps1
@@ -7,7 +7,7 @@ param(
     [switch]$nobuild = $false
 )
 
-$currentVersion = "2.9.0"
+$currentVersion = "2.9.1"
 $wixProductPath = Join-Path $PSScriptRoot "Installer\DaisyAddinForWordSetup\Product.wxs"
 
 # Create the wix directory tree for a path

diff --git a/resources/daisy-pipeline/etc/releaseDescriptor.xml b/resources/daisy-pipeline/etc/releaseDescriptor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<releaseDescriptor href="http://daisy.github.io/pipeline-assembly/releases/1.14.20" version="1.14.20" time="2024-11-12T12:12:08Z">
+<releaseDescriptor href="http://daisy.github.io/pipeline-assembly/releases/1.14.20" version="1.14.20" time="2024-12-19T13:34:08Z">
     <artifact href="https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.0.11/logback-classic-1.0.11.jar" id="ch.qos.logback/logback-classic/1.0.11" extract="false" deployPath="system/common/ch.qos.logback.logback-classic-1.0.11.jar" version="1.0.11" artifactId="logback-classic" groupId="ch.qos.logback" classifier="" overwrite-path="true"/>
     <artifact href="https://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.0.11/logback-core-1.0.11.jar" id="ch.qos.logback/logback-core/1.0.11" extract="false" deployPath="system/common/ch.qos.logback.logback-core-1.0.11.jar" version="1.0.11" artifactId="logback-core" groupId="ch.qos.logback" classifier="" overwrite-path="true"/>
     <artifact href="https://repo1.maven.org/maven2/com/google/guava/guava/24.1.1-android/guava-24.1.1-android.jar" id="com.google.guava/guava/24.1.1-android" extract="false" deployPath="system/common/com.google.guava.guava-24.1.1-android.jar" version="24.1.1-android" artifactId="guava" groupId="com.google.guava" classifier="" overwrite-path="true"/>

diff --git a/...daisy-pipeline/system/common/org.daisy.pipeline.modules.word-to-dtbook-1.0.3-SNAPSHOT.jar b/...daisy-pipeline/system/common/org.daisy.pipeline.modules.word-to-dtbook-1.0.3-SNAPSHOT.jar