From 4b0eeaec020dd8a9ebeab7cef1cc17d0d60c7d13 Mon Sep 17 00:00:00 2001
From: MouriNaruto <Mouri_Naruto@Outlook.com>
Date: Thu, 24 Nov 2022 23:08:16 +0800
Subject: [PATCH] Update to 2.0.450.0.

---
 Documents/ReleaseNotes.md                     |   3 ++-
 Documents/ReleaseNotesPreview.md              |   1 +
 NanaZip/Mile.Project.Properties.h             | Bin 1966 -> 1970 bytes
 NanaZipConsole/Mile.Project.Properties.h      | Bin 1998 -> 2002 bytes
 NanaZipCore/Mile.Project.Properties.h         | Bin 1942 -> 1946 bytes
 NanaZipInstaller/Mile.Project.Properties.h    | Bin 1972 -> 1976 bytes
 NanaZipInstaller/NanaZipInstaller.rc          | Bin 3316 -> 3302 bytes
 NanaZipPackage/NanaZipPackage.wapproj         |   2 +-
 NanaZipPackage/Package.appxmanifest           |  18 +++++++++---------
 NanaZipSfxConsole/Mile.Project.Properties.h   | Bin 2024 -> 2028 bytes
 NanaZipSfxSetup/Mile.Project.Properties.h     | Bin 2012 -> 2016 bytes
 NanaZipSfxWindows/Mile.Project.Properties.h   | Bin 2024 -> 2028 bytes
 .../Mile.Project.Properties.h                 | Bin 2004 -> 2008 bytes
 .../NanaZipShellExtension.cpp                 |   4 ++--
 NanaZipWindows/Mile.Project.Properties.h      | Bin 1998 -> 2002 bytes
 SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc  |   2 +-
 .../CPP/7zip/Bundles/SFXSetup/resource.rc     |   2 +-
 SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc  |   2 +-
 SevenZip/CPP/7zip/UI/FileManager/resource.rc  |   2 +-
 SevenZip/CPP/7zip/UI/GUI/resource.rc          |   2 +-
 20 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Documents/ReleaseNotes.md b/Documents/ReleaseNotes.md
index 0be09b104..0923a6bf8 100644
--- a/Documents/ReleaseNotes.md
+++ b/Documents/ReleaseNotes.md
@@ -3,7 +3,7 @@
 For preview versions, please read 
 [NanaZip Preview Release Notes](ReleaseNotesPreview.md).
 
-**NanaZip 2.0 Update 1 (2.0.xxx.0)**
+**NanaZip 2.0 Update 1 (2.0.450.0)**
 
 - Optimize NanaZip binaries via adjusting the WindowsTargetPlatformMinVersion
   to 10.0.19041.0 in all packaged NanaZip binaries projecta except the Self
@@ -14,6 +14,7 @@ For preview versions, please read
   (https://github.com/ProjectMile/Mile.Xaml/releases/tag/1.1.434.0)
 - Update Mile.Windows.Helpers to 1.0.8.
   (https://github.com/ProjectMile/Mile.Windows.Helpers/commits/main)
+- Add dark mode support for context menus.
 - Refresh the about dialog with Windows 11 XAML control styles and the 
   immersive Mica effects.
 - Fix model dialog style behavior for About dialog.
diff --git a/Documents/ReleaseNotesPreview.md b/Documents/ReleaseNotesPreview.md
index 929f897f7..b8b379f3e 100644
--- a/Documents/ReleaseNotesPreview.md
+++ b/Documents/ReleaseNotesPreview.md
@@ -21,6 +21,7 @@ For stable versions, please read [NanaZip Release Notes](ReleaseNotes.md).
   (https://github.com/ProjectMile/Mile.Xaml/releases/tag/1.1.434.0)
 - Update Mile.Windows.Helpers to 1.0.8. (Updated in NanaZip 2.0 Update 1.)
   (https://github.com/ProjectMile/Mile.Windows.Helpers/commits/main)
+- Add dark mode support for context menus. (Updated in NanaZip 2.0 Update 1.)
 - Refresh the about dialog with Windows 11 XAML control styles and the 
   immersive Mica effects. (Updated in NanaZip 2.0 Update 1.)
 - Fix model dialog style behavior for About dialog. (Updated in NanaZip 2.0
diff --git a/NanaZip/Mile.Project.Properties.h b/NanaZip/Mile.Project.Properties.h
index c4c6f6d044d18d741212f2007246c4f91e22ad4a..f3b3caffa729996fa3ca2edbc317cfb356a117d4 100644
GIT binary patch
delta 43
vcmZ3-zlnc?7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^ttYZcM4^0cm

delta 44
xcmdnQzm9){7Bi#a<oitale3t4SdAGh87#rPUCc6*tyr`s^Dzr-7Gask3;-jj3^4!z

diff --git a/NanaZipConsole/Mile.Project.Properties.h b/NanaZipConsole/Mile.Project.Properties.h
index 068b17bc89cb4187e8127b2385a669144272d3d0..0cc84124ad633be3ffc752c4e4a0a45c39b373da 100644
GIT binary patch
delta 43
vcmX@de~EvC7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^toMQ$68Vw96

delta 44
xcmcb_e~y2H7Bi#a<oitale3t4SdAGh87#rPUCc6*tyr`s^Dzr-7Gc@P3;-^u43Pi;

diff --git a/NanaZipCore/Mile.Project.Properties.h b/NanaZipCore/Mile.Project.Properties.h
index 9e4b72fd299f6f7086a5a9698b4a808753eee9c2..823b1d00e67c157dd440db6953c8a5ee7a7ae674 100644
GIT binary patch
delta 43
vcmbQnKZ}2Z7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^tOk)NB2R#db

delta 44
xcmbQmKaGEb7Bi#a<oitale3t4SdAGh87#rPUCc6*tyr`s^Dzr-7GY^)1^^pq3+Vs=

diff --git a/NanaZipInstaller/Mile.Project.Properties.h b/NanaZipInstaller/Mile.Project.Properties.h
index a420a2fb13c1aadea47cabf2171b0b9c1e1fc370..b7c128e61f032dc49efe46ae8ab9320b656a6f42 100644
GIT binary patch
delta 43
vcmdnOzk`2+7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^tY+(if5m5`;

delta 52
zcmdnNzlDE;7Bi#aWJOl}$$ZQLle3t4SdAGh87$!<yO?DrTd`<?WH*bjEMW!!OHd3I

diff --git a/NanaZipInstaller/NanaZipInstaller.rc b/NanaZipInstaller/NanaZipInstaller.rc
index 24b4a4a07badf3ff162873e4c52cbf3307fb017b..a581f5145bf6a604cec827cc8cfc11570bc56426 100644
GIT binary patch
delta 12
Tcmew&`Al-d2F}g<IL(*=C-Vg<

delta 26
gcmaDR`9*TW22S1ph9ZVkhBAgsAX&b7J*PP{0D9sG3IG5A

diff --git a/NanaZipPackage/NanaZipPackage.wapproj b/NanaZipPackage/NanaZipPackage.wapproj
index e41a55f8f..728d1d6ac 100644
--- 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
index 8db669371..ed41efc70 100644
--- a/NanaZipPackage/Package.appxmanifest
+++ b/NanaZipPackage/Package.appxmanifest
@@ -16,12 +16,12 @@
   IgnorableNamespaces="uap rescap desktop uap2 uap3 com desktop4 desktop5 uap8 uap10 virtualization">
 
   <Identity
-    Name="40174MouriNaruto.NanaZipPreview"
+    Name="40174MouriNaruto.NanaZip"
     Publisher="CN=E310A153-74A9-4D81-800B-857A8D58408A"
-    Version="2.1.399.0" />
+    Version="2.0.450.0" />
 
   <Properties>
-    <DisplayName>NanaZip Preview</DisplayName>
+    <DisplayName>NanaZip</DisplayName>
     <PublisherDisplayName>Kenji Mouri</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
     <uap10:PackageIntegrity>
@@ -134,7 +134,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -157,7 +157,7 @@
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements 
         AppListEntry="none"
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -179,7 +179,7 @@
       Executable="NanaZip.exe"
       EntryPoint="Windows.FullTrustApplication">
       <uap:VisualElements
-        DisplayName="NanaZip Preview"
+        DisplayName="NanaZip"
         Description="NanaZip"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
@@ -264,17 +264,17 @@
             <!-- Our verb name starts with "C" to work around a bug preventing our shell menu from appearing in the
                  classic context menu. -->
             <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>
             <desktop5:ItemType Type="*">
-              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="469D94E9-6AF4-4395-B396-99B1308F8CE5" />
+              <desktop5:Verb Id="CNanaZipShellExtension" Clsid="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" />
             </desktop5: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="NanaZipShellExtension.dll" ThreadingModel="STA"/>
+              <com:Class Id="CAE3F1D4-7765-4D98-A060-52CD14D56EAB" Path="NanaZipShellExtension.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
         </com:Extension>
diff --git a/NanaZipSfxConsole/Mile.Project.Properties.h b/NanaZipSfxConsole/Mile.Project.Properties.h
index 300883b37305a5aeeb64100fcfbc7cda6c2445d9..3e4fbc71a5aa1dc0231038a508b5671158b6f2fa 100644
GIT binary patch
delta 43
vcmaFC|Av2q7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^tykG_ZBFPMP

delta 52
zcmaFE|AK#m7Bi#aWJPxU$$ZQLle3t4SdAGh87$!<yO?DrTd`<?WH*bj++YR(VDJpJ

diff --git a/NanaZipSfxSetup/Mile.Project.Properties.h b/NanaZipSfxSetup/Mile.Project.Properties.h
index eef69beed534577c3dff6697d97c65efd204495c..fae3ca8e4ded17456e40dac738d7e2dd0c8d1f51 100644
GIT binary patch
delta 43
vcmcb^|A2pk7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^t++hX)9>EM!

delta 52
zcmaFBe}{jA7Bi#a<cVzhllhnhCTB78uo^R1GFZYzb}`FLwqnr&$!->5Il~M9c(4s`

diff --git a/NanaZipSfxWindows/Mile.Project.Properties.h b/NanaZipSfxWindows/Mile.Project.Properties.h
index 9d89fc39a8f937786b5b7b754d040397f9397ab3..eaff1cb2436e3b25dad43289cd719e4f40b3d26e 100644
GIT binary patch
delta 43
vcmaFC|Av2q7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^tykG_ZBFPMP

delta 52
zcmaFE|AK#m7Bi#aWJPxU$$ZQLle3t4SdAGh87$!<yO?DrTd`<?WH*bj++YR(VDJpJ

diff --git a/NanaZipShellExtension/Mile.Project.Properties.h b/NanaZipShellExtension/Mile.Project.Properties.h
index f82966a007f2333f4d213e959faca9d17ed3d59c..5159ac174e4ef24fff156675ed1444883214914c 100644
GIT binary patch
delta 43
vcmcb@e}jL67Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^tTww+P91#pU

delta 44
xcmcb?e}#X87Bi#a<oitale3t4SdAGh87#rPUCc6*tyr`s^Dzr-7GXKU3;-~=45I)5

diff --git a/NanaZipShellExtension/NanaZipShellExtension.cpp b/NanaZipShellExtension/NanaZipShellExtension.cpp
index 976a60da3..e44a02b9b 100644
--- a/NanaZipShellExtension/NanaZipShellExtension.cpp
+++ b/NanaZipShellExtension/NanaZipShellExtension.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/NanaZipWindows/Mile.Project.Properties.h b/NanaZipWindows/Mile.Project.Properties.h
index 957c36fae73f2ac107ea1b3f06a6b6804f92265e..278c87650ae1420807444c5a65069f5164616cac 100644
GIT binary patch
delta 43
vcmX@de~EvC7Bi#4<crMqle3t4SWOsA86dn}%reaS4EmD;nY1^toMQ$68Vw96

delta 44
xcmcb_e~y2H7Bi#a<oitale3t4SdAGh87#rPUCc6*tyr`s^Dzr-7Gc@P3;-^u43Pi;

diff --git a/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
index 24096cc2d..ccf4d5a8e 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXCon/resource.rc
@@ -1 +1 @@
-101 ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
\ No newline at end of file
+101 ICON "../../../../../Assets/NanaZipSfx.ico"
\ No newline at end of file
diff --git a/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
index e48d312b0..c98a73ba8 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXSetup/resource.rc
@@ -1,6 +1,6 @@
 #include "resource.h"
 
-IDI_ICON  ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON  ICON "../../../../../Assets/NanaZipSfx.ico"
 
 STRINGTABLE
 BEGIN
diff --git a/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc b/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
index ef28e4cf0..6aa0729e5 100644
--- a/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
+++ b/SevenZip/CPP/7zip/Bundles/SFXWin/resource.rc
@@ -7,7 +7,7 @@
 #define xc 240
 #define yc 64
 
-IDI_ICON ICON "../../../../../Assets/NanaZipPreviewSfx.ico"
+IDI_ICON ICON "../../../../../Assets/NanaZipSfx.ico"
 
 IDD_EXTRACT  DIALOG  0, 0, xs, ys  MY_MODAL_DIALOG_STYLE  MY_FONT
 CAPTION "NanaZip SFX"
diff --git a/SevenZip/CPP/7zip/UI/FileManager/resource.rc b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
index 8c52ab8f8..d2f4abb15 100644
--- a/SevenZip/CPP/7zip/UI/FileManager/resource.rc
+++ b/SevenZip/CPP/7zip/UI/FileManager/resource.rc
@@ -138,7 +138,7 @@ BEGIN
 END
 
 
-IDI_ICON  ICON  "../../../../../Assets/NanaZipPreview.ico"
+IDI_ICON  ICON  "../../../../../Assets/NanaZip.ico"
 
 IDB_ADD        BITMAP  "../../../../../NanaZip/Assets/Toolbar/Add_32x32.bmp"
 IDB_EXTRACT    BITMAP  "../../../../../NanaZip/Assets/Toolbar/Extract_32x32.bmp"
diff --git a/SevenZip/CPP/7zip/UI/GUI/resource.rc b/SevenZip/CPP/7zip/UI/GUI/resource.rc
index 75203f22e..3dd8afa2a 100644
--- a/SevenZip/CPP/7zip/UI/GUI/resource.rc
+++ b/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"