Merge pull request #1590 from d2phap/develop

v8.9

.gitignore

@@ -168,3 +168,5 @@ Source/ImageGlass/obj/Debug/DesignTimeResolveAssemblyReferences.cache
 
 BundleArtifacts
 BundleArtifactsUpload
+node_modules/
+launchSettings.json

LICENSE

@@ -23,7 +23,9 @@ ImageGlass Store and ImageGlass Classic.
 2) The name and logo of ImageGlass Software are the property of Duong
 Dieu Phap and are protected by copyright laws and international treaty
 provisions. Therefore, the Software must be treated as any other
-copyrighted material.
+copyrighted material. Any software utilizing the ImageGlass source code
+must obtain written permission from the author before using the ImageGlass
+Software name and logo.
 
 3) Warranty Disclaimer: ImageGlass and documentation are provided "as is"
 without any warranty, express or implied, including, but not limited to,

README.md

@@ -38,14 +38,14 @@ ImageGlass is a lightweight software designed for seamless viewing of images in
 ImageGlass 9.0 is the biggest update ever, supports ***hardware acceleration*** and many more. I have been rewriting the entire app for months. There will be a few more beta releases before version 9.0 reaches a stable state. In the meanwhile, you will still receive the updates for version 8.x.
 - ✅ [Version 9.0 beta 1](https://github.com/d2phap/ImageGlass/releases/tag/9.0.1.514) was released.
 - ✅ [Version 9.0 beta 2](https://github.com/d2phap/ImageGlass/releases/tag/9.0.2.904) was released.
-- ✅ [Version 9.0 beta 3](https://github.com/d2phap/ImageGlass/releases/tag/9.0.3.1225) was released. Try it and let me know your feedback.
-- 🎯 [Version 9.0 beta 4](https://github.com/d2phap/ImageGlass/projects/14) is under development.
+- ✅ [Version 9.0 beta 3](https://github.com/d2phap/ImageGlass/releases/tag/9.0.3.1225) was released.
+- ✅ [Version 9.0 beta 4](https://github.com/d2phap/ImageGlass/releases/tag/9.0.4.416) was released. Try it and let me know your feedback.
+- 🎯 [Version 9.0 beta 5](https://github.com/d2phap/ImageGlass/projects/15) is under development.
 
-ImageGlass 9 uses [.NET 6](https://devblogs.microsoft.com/dotnet/announcing-net-6/). If you are unable to install .NET 6, you can still use version 8.
-  <br/>
-  <a href="https://devblogs.microsoft.com/dotnet/announcing-net-6/" target="_blank" rel="noreferrer noopener">
-    <img src="https://kontext.tech/api/flex/medias/obj-2290" alt="ImageGlass on .NET 6" style="height:50px" />
-  </a>
+### 🔴 ImageGlass 9 minimum requirements:
+- [.NET Desktop Runtime 6](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
+- [Webview2 runtime 64-bit](https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section)
+- Windows 10 64-bit
 
 
 ## 👨‍💻 Development
@@ -68,7 +68,7 @@ ImageGlass is free for both personal and commercial use, except the Store versio
 - [Command lines](https://imageglass.org/docs/command-line-utilities)
 - [EULA](https://imageglass.org/license)
 
-For more information about ImageGlass, go to [Documentation](https://imageglass.org/docs)
+For more information about ImageGlass, go to [ImageGlass Docs](https://imageglass.org/docs).
 
 
 ## 🤼 Community and Support

Source/Components/ImageGlass.Base/ImageGlass.Base.csproj

@@ -103,8 +103,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CliWrap, Version=3.6.0.0, Culture=neutral, PublicKeyToken=1c4a4fc2d6886e5a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CliWrap.3.6.0\lib\net462\CliWrap.dll</HintPath>
+    <Reference Include="CliWrap, Version=3.6.3.0, Culture=neutral, PublicKeyToken=1c4a4fc2d6886e5a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CliWrap.3.6.3\lib\net462\CliWrap.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -171,23 +171,23 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
+  <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
   </Target>
 </Project>

Source/Components/ImageGlass.Base/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CliWrap" version="3.6.0" targetFramework="net48" />
+  <package id="CliWrap" version="3.6.3" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net48" />
-  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="17.5.22" targetFramework="net48" developmentDependency="true" />
+  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="17.6.40" targetFramework="net48" developmentDependency="true" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />

Source/Components/ImageGlass.Heart/ImageGlass.Heart.csproj

@@ -115,14 +115,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-HDRI-OpenMP-x64, Version=13.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
-      <HintPath>..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.0.1\lib\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.dll</HintPath>
+    <Reference Include="Magick.NET-Q16-HDRI-OpenMP-x64, Version=13.1.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
+      <HintPath>..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.1.3\lib\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET.Core, Version=13.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET.Core.13.0.1\lib\netstandard20\Magick.NET.Core.dll</HintPath>
+    <Reference Include="Magick.NET.Core, Version=13.1.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET.Core.13.1.3\lib\netstandard20\Magick.NET.Core.dll</HintPath>
     </Reference>
     <Reference Include="Magick.NET.SystemDrawing, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET.SystemDrawing.7.0.1\lib\net462\Magick.NET.SystemDrawing.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET.SystemDrawing.7.0.5\lib\net462\Magick.NET.SystemDrawing.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -163,25 +163,25 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
-    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.CSharp.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\cs\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.dll" />
+    <Analyzer Include="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\analyzers\vb\Microsoft.VisualStudio.Threading.Analyzers.VisualBasic.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.1.3\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets" Condition="Exists('..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.1.3\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.0.1\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.0.1\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.1.3\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.1.3\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.5.22\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
-  <Import Project="..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.0.1\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets" Condition="Exists('..\..\packages\Magick.NET-Q16-HDRI-OpenMP-x64.13.0.1\build\netstandard20\Magick.NET-Q16-HDRI-OpenMP-x64.targets')" />
+  <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.17.6.40\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
 </Project>

Source/Components/ImageGlass.Heart/Photo.cs

@@ -96,6 +96,9 @@ public static class Photo {
 
                     // Issue https://github.com/d2phap/ImageGlass/issues/1181
                     "32928",
+
+                    // Issue https://github.com/d2phap/ImageGlass/issues/1583
+                    "32932",
                 },
                 });
             }
@@ -114,7 +117,7 @@ public static class Photo {
             // Fix RAW color
             settings.SetDefines(new DngReadDefines() {
                 UseCameraWhitebalance = true,
-                OutputColor = DngOutputColor.AdobeRGB,
+                OutputColor = DngOutputColor.SRGB,
                 ReadThumbnail = true,
             });
 
@@ -300,8 +303,8 @@ public static class Photo {
                 }
 
 
-                // Issue #679: fix targa display with Magick.NET 7.15.x 
-                if (ext == ".TGA") {
+                // Issue #679, #1478
+                if (ext == ".TGA" || ext == ".NEF" || ext == ".DNG") {
                     imgM.AutoOrient();
                 }
 

Source/Components/ImageGlass.Heart/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Magick.NET.Core" publicKeyToken="2004825badfa91ec" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.2.0.0" newVersion="12.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

Source/Components/ImageGlass.Heart/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="IconLib.Unofficial" version="0.73.0" targetFramework="net48" />
-  <package id="Magick.NET.Core" version="13.0.1" targetFramework="net48" />
-  <package id="Magick.NET.SystemDrawing" version="7.0.1" targetFramework="net48" />
-  <package id="Magick.NET-Q16-HDRI-OpenMP-x64" version="13.0.1" targetFramework="net48" />
-  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="17.5.22" targetFramework="net48" developmentDependency="true" />
+  <package id="Magick.NET.Core" version="13.1.3" targetFramework="net48" />
+  <package id="Magick.NET.SystemDrawing" version="7.0.5" targetFramework="net48" />
+  <package id="Magick.NET-Q16-HDRI-OpenMP-x64" version="13.1.3" targetFramework="net48" />
+  <package id="Microsoft.VisualStudio.Threading.Analyzers" version="17.6.40" targetFramework="net48" developmentDependency="true" />
 </packages>