Release 6.1.0 Alpha 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index aeff9df89ba9344366aff6358c134ff460546af6..706a5ce7661f355f94262a0bf9a0bb8457c2a88a 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
                <packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
                <isapplication>1</isapplication>
-               <version>6.1.0 Alpha 1</version>
-               <date>2024-08-14</date>
+               <version>6.1.0 Alpha 2</version>
+               <date>2024-08-20</date>
        </packageinformation>
 
        <authorinformation>
@@ -50,52 +50,10 @@
                <instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
        </instructions>
 
-       <instructions type="update" fromversion="6.0.*">
-               <!--
-tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
-       acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php \
-       acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php \
-       acp/update_com.woltlab.wcf_6.1_sharedTemplate.php \
-       acp/database/update_com.woltlab.wcf_6.1.php
-               -->
-               <instruction type="file">files_pre_check.tar</instruction>
-
-               <!-- Checks that need to happen before the upgrade starts. -->
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php</instruction>
-
-               <!-- Required for the shared templates. -->
-               <instruction type="script">acp/update_com.woltlab.wcf_6.1_sharedTemplate.php</instruction>
-
-               <!-- Clean up any duplicate entries in the message embedded objects table. -->
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php</instruction>
-
-               <!-- Migrate the database as early as possible. -->
-               <instruction type="database">acp/database/update_com.woltlab.wcf_6.1.php</instruction>
-
-               <!-- Deploy the new application code. -->
-               <instruction type="file"/>
-               <instruction type="acpTemplate"/>
-               <instruction type="template"/>
-
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_spider_step1.php</instruction>
-               <instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.1_spider_step2.php</instruction>
-
+       <instructions type="update" fromversion="6.1.0 Alpha 1">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
                <instruction type="language"/>
-               <instruction type="objectTypeDefinition"/>
-               <instruction type="objectType"/>
-               <instruction type="page"/>
-               <instruction type="userGroupOption"/>
-               <instruction type="userProfileMenu"/>
-               <instruction type="bbcode"/>
-               <instruction type="acpTemplateDelete"/>
-               <instruction type="fileDelete"/>
-               <instruction type="userMenu"/>
-               <instruction type="option"/>
-               <instruction type="templateDelete"/>
-               <instruction type="cronjob"/>
-               <instruction type="userOption"/>
-               <instruction type="userNotificationEvent"/>
-
-               <instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c50861e36624906310c428318b3180965d14e6ff..1514d6a91051ed9dd54a6ce2029ec3be5a1fca33 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -79,7 +79,7 @@ if (\function_exists('mb_regex_encoding')) {
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.0 Alpha 1');
+\define('WCF_VERSION', '6.1.0 Alpha 2');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());