Update package version to 3.0.1000.0.

M2Team · May 27, 2024 · 626d820 · 626d820
1 parent 0c48b19
commit 626d820
Show file tree

Hide file tree

Showing 21 changed files with 49 additions and 43 deletions.
diff --git a/Documents/ReleaseNotes.md b/Documents/ReleaseNotes.md
@@ -3,7 +3,7 @@
 For preview versions, please read 
 [NanaZip Preview Release Notes](ReleaseNotesPreview.md).
 
-**NanaZip 3.0 Update 1 (3.0.10xx.0)**
+**NanaZip 3.0 Update 1 (3.0.1000.0)**
 
 - Update Mile.Windows.Internal to 1.0.2889.
 - Make the 7-Zip Zstandard branch's specific options translatable. (Contributed
@@ -19,6 +19,12 @@ For preview versions, please read
 - Use Extract dialog when extracting without selection. (Contributed by 
   dinhngtu.)
 - Fix tooltips from XAML controls cannot be transparent.
+- Fix dark mode UI font rendering issues in some Windows 10 environments.
+- Adjust the dark mode text color for improving the user experience. (Suggested
+  by userzzzq.)
+- Synchronize the 7-Zip mainline implementations to 24.06.
+  (https://github.com/ip7z/7zip/releases/tag/24.06) (Thanks to Igor Pavlov.
+  Noticed by KsZAO.)
 
 **NanaZip 3.0 (3.0.996.0)**
 

diff --git a/NanaZip.Codecs/NanaZip.Codecs.vcxproj b/NanaZip.Codecs/NanaZip.Codecs.vcxproj
@@ -13,8 +13,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Codecs.dll</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />

diff --git a/NanaZip.Core/NanaZip.Core.Sfx.Console.vcxproj b/NanaZip.Core/NanaZip.Core.Sfx.Console.vcxproj
@@ -13,8 +13,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Core.Console.sfx</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.Default.props" />

diff --git a/NanaZip.Core/NanaZip.Core.Sfx.Setup.vcxproj b/NanaZip.Core/NanaZip.Core.Sfx.Setup.vcxproj
@@ -13,8 +13,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Core.Setup.sfx</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.Default.props" />

diff --git a/NanaZip.Core/NanaZip.Core.Sfx.Windows.vcxproj b/NanaZip.Core/NanaZip.Core.Sfx.Windows.vcxproj
@@ -13,8 +13,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Core.Windows.sfx</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Cpp.Default.props" />

diff --git a/NanaZip.Core/NanaZip.Core.vcxproj b/NanaZip.Core/NanaZip.Core.vcxproj
@@ -12,8 +12,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Core.dll</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />

diff --git a/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc b/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
@@ -8,7 +8,7 @@
 
 // **************** NanaZip Modification Start ****************
 //IDI_ICON ICON "7z.ico"
-101 ICON "../../../../../../Assets/NanaZipPreviewSfx.ico"
+101 ICON "../../../../../../Assets/NanaZipSfx.ico"
 // **************** NanaZip Modification End ****************
 
 // **************** NanaZip Modification Start ****************

diff --git a/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc b/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
@@ -9,7 +9,7 @@
 
 // **************** NanaZip Modification Start ****************
 //IDI_ICON  ICON "setup.ico"
-IDI_ICON ICON "../../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON ICON "../../../../../../Assets/NanaZipSfx.ico"
 // **************** NanaZip Modification End ****************
 
 STRINGTABLE

diff --git a/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc b/NanaZip.Core/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
@@ -16,7 +16,7 @@
 
 // **************** NanaZip Modification Start ****************
 //IDI_ICON ICON "7z.ico"
-IDI_ICON ICON "../../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON ICON "../../../../../../Assets/NanaZipSfx.ico"
 // **************** NanaZip Modification End ****************
 
 IDD_EXTRACT  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT

diff --git a/NanaZip.UI.Classic/NanaZip.vcxproj b/NanaZip.UI.Classic/NanaZip.vcxproj
@@ -14,8 +14,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />

diff --git a/NanaZip.UI.Classic/NanaZipConsole.vcxproj b/NanaZip.UI.Classic/NanaZipConsole.vcxproj
@@ -14,8 +14,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZipC.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />

diff --git a/NanaZip.UI.Classic/NanaZipWindows.vcxproj b/NanaZip.UI.Classic/NanaZipWindows.vcxproj
@@ -15,8 +15,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZipG.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x86.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />

diff --git a/NanaZip.UI.Modern/NanaZip.Console.vcxproj b/NanaZip.UI.Modern/NanaZip.Console.vcxproj
@@ -15,8 +15,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Console.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />

diff --git a/NanaZip.UI.Modern/NanaZip.Modern.vcxproj b/NanaZip.UI.Modern/NanaZip.Modern.vcxproj
@@ -21,8 +21,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Modern.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />

diff --git a/NanaZip.UI.Modern/NanaZip.ShellExtension.cpp b/NanaZip.UI.Modern/NanaZip.ShellExtension.cpp
@@ -916,7 +916,7 @@ namespace NanaZip::ShellExtension
                 return E_NOTIMPL;
             }
 
-            return ::SHStrDupW(L"NanaZip Preview", ppszName);
+            return ::SHStrDupW(L"NanaZip", ppszName);
         }
 
         HRESULT STDMETHODCALLTYPE GetIcon(
@@ -1042,7 +1042,7 @@ namespace NanaZip::ShellExtension
 #pragma endregion
     };
 
-    struct DECLSPEC_UUID("469D94E9-6AF4-4395-B396-99B1308F8CE5")
+    struct DECLSPEC_UUID("CAE3F1D4-7765-4D98-A060-52CD14D56EAB")
         ClassFactory : public winrt::implements<
         ClassFactory, IClassFactory>
     {

diff --git a/NanaZip.UI.Modern/NanaZip.ShellExtension.vcxproj b/NanaZip.UI.Modern/NanaZip.ShellExtension.vcxproj
@@ -15,8 +15,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.ShellExtension.dll</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />

diff --git a/NanaZip.UI.Modern/NanaZip.Windows.vcxproj b/NanaZip.UI.Modern/NanaZip.Windows.vcxproj
@@ -16,8 +16,8 @@
     <MileProjectLegalCopyright>© M2-Team and Contributors. All rights reserved.</MileProjectLegalCopyright>
     <MileProjectOriginalFilename>NanaZip.Windows.exe</MileProjectOriginalFilename>
     <MileProjectProductName>NanaZip</MileProjectProductName>
-    <MileProjectVersion>3.5.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
-    <MileProjectVersionTag>Preview 0</MileProjectVersionTag>
+    <MileProjectVersion>3.0.$([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2021-08-31'))).TotalDays).0</MileProjectVersion>
+    <MileProjectVersionTag>Update 1</MileProjectVersionTag>
   </PropertyGroup>
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.x64.props" />
   <Import Project="..\Mile.Project.Windows\Mile.Project.Platform.ARM64.props" />

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/resource.rc b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/FileManager/resource.rc
@@ -115,7 +115,7 @@ BEGIN
 END
 
 
-IDI_ICON  ICON  "../../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON  ICON  "../../../../../../Assets/NanaZip.ico"
 
 IDB_PARENT_FOLDER      BITMAP  "../../../../../Assets/ParentFolder.bmp"
 

diff --git a/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/resource.rc b/NanaZip.UI.Modern/SevenZip/CPP/7zip/UI/GUI/resource.rc
@@ -3,7 +3,7 @@
 
 #include "../FileManager/resourceGui.rc"
 
-IDI_ICON ICON "../../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON ICON "../../../../../../Assets/NanaZip.ico"
 
 #include "../FileManager/PropertyName.rc"
 #include "../FileManager/OverwriteDialog.rc"

diff --git a/NanaZipPackage/NanaZipPackage.wapproj b/NanaZipPackage/NanaZipPackage.wapproj
@@ -27,7 +27,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- Image Assets -->
-    <Content Include="..\Assets\PreviewPackageAssets\**\*">
+    <Content Include="..\Assets\PackageAssets\**\*">
       <DeploymentContent>true</DeploymentContent>
       <Link>Assets\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>

diff --git a/NanaZipPackage/Package.appxmanifest b/NanaZipPackage/Package.appxmanifest
@@ -17,12 +17,12 @@
   IgnorableNamespaces="uap rescap desktop uap2 uap3 com desktop4 desktop5 desktop10 uap8 uap10 virtualization">
 
   <Identity
-    Name="40174MouriNaruto.NanaZipPreview"
+    Name="40174MouriNaruto.NanaZip"
     Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A"
-    Version="3.5.996.0" />
+    Version="3.0.1000.0" />
 
   <Properties>
-    <DisplayName>NanaZip Preview</DisplayName>
+    <DisplayName>NanaZip</DisplayName>
     <PublisherDisplayName>Kenji Mouri</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
     <uap10:PackageIntegrity>
@@ -135,7 +135,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -158,7 +158,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -180,7 +180,7 @@
       Executable="NanaZip.Modern.exe"
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -272,20 +272,20 @@
             <!-- Our verb name starts with "C" to work around a bug preventing our shell menu from appearing in the
                  classic context menu. -->
             <desktop4:ItemType Type="*">
-              <desktop4:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop4:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop4:ItemType>
             <desktop5:ItemType Type="Directory">
-              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5:ItemType>
             <desktop10:ItemType Type="Drive">
-              <desktop10:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop10:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop10:ItemType>
           </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
             <com:SurrogateServer DisplayName="NanaZip Shell Extension">
-              <com:Class Id="469D94E9-6AF4-4395-B396-99B1308F8CE5" Path="NanaZip.ShellExtension.dll" ThreadingModel="STA"/>
+              <com:Class Id="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" Path="NanaZip.ShellExtension.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
         </com:Extension>