Revert "[PowerToys Run] Update to net5 (#12434)" (#12543)

This reverts commit c651a4b36e.

src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs

@@ -88,7 +88,7 @@ namespace Wox.Infrastructure.Exception
             sb.AppendLine();
             sb.AppendLine("## Assemblies - " + AppDomain.CurrentDomain.FriendlyName);
             sb.AppendLine();
-            foreach (var ass in AppDomain.CurrentDomain.GetAssemblies())
+            foreach (var ass in AppDomain.CurrentDomain.GetAssemblies().OrderBy(o => o.GlobalAssemblyCache ? 50 : 0))
             {
                 sb.Append("* ");
                 sb.Append(ass.FullName);

src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs

@@ -7,7 +7,6 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Media;
-using Wox.Infrastructure.Storage;
 using Wox.Plugin;
 
 namespace Wox.Infrastructure.Image
@@ -20,16 +19,8 @@ namespace Wox.Infrastructure.Image
 
         private readonly ConcurrentDictionary<string, ImageSource> _data = new ConcurrentDictionary<string, ImageSource>();
 
-        [NonSerialized]
-        private readonly WoxJsonStorage<ConcurrentDictionary<string, int>> _usageStorage;
-
         public ConcurrentDictionary<string, int> Usage { get; private set; } = new ConcurrentDictionary<string, int>();
 
-        public ImageCache()
-        {
-            _usageStorage = new WoxJsonStorage<ConcurrentDictionary<string, int>>("ImageUsageCache");
-        }
-
         public ImageSource this[string path]
         {
             get
@@ -96,14 +87,9 @@ namespace Wox.Infrastructure.Image
             return new Dictionary<string, int>(Usage);
         }
 
-        public void Initialize()
+        public void SetUsageAsDictionary(Dictionary<string, int> usage)
         {
-            Usage = _usageStorage.Load();
-        }
-
-        public void Save()
-        {
-            _usageStorage.Save();
+            Usage = new ConcurrentDictionary<string, int>(usage);
         }
     }
 }

src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs

@@ -29,6 +29,7 @@ namespace Wox.Infrastructure.Image
         private static readonly ImageCache ImageCache = new ImageCache();
         private static readonly ConcurrentDictionary<string, string> GuidToKey = new ConcurrentDictionary<string, string>();
 
+        private static BinaryStorage<Dictionary<string, int>> _storage;
         private static IImageHashGenerator _hashGenerator;
 
         public static string ErrorIconPath { get; set; }
@@ -48,8 +49,9 @@ namespace Wox.Infrastructure.Image
 
         public static void Initialize(Theme theme)
         {
+            _storage = new BinaryStorage<Dictionary<string, int>>("Image");
             _hashGenerator = new ImageHashGenerator();
-            ImageCache.Initialize();
+            ImageCache.SetUsageAsDictionary(_storage.TryLoad(new Dictionary<string, int>()));
 
             foreach (var icon in new[] { Constant.DefaultIcon, Constant.ErrorIcon, Constant.LightThemedDefaultIcon, Constant.LightThemedErrorIcon })
             {
@@ -76,7 +78,7 @@ namespace Wox.Infrastructure.Image
         public static void Save()
         {
             ImageCache.Cleanup();
-            ImageCache.Save();
+            _storage.Save(ImageCache.GetUsageAsDictionary());
         }
 
         // Todo : Update it with icons specific to each theme.

src/modules/launcher/Wox.Infrastructure/Storage/BinaryStorage`1.cs

@@ -0,0 +1,156 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.IO.Abstractions;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters;
+using System.Runtime.Serialization.Formatters.Binary;
+using Wox.Plugin;
+using Wox.Plugin.Logger;
+
+namespace Wox.Infrastructure.Storage
+{
+    /// <summary>
+    /// Storage object using binary data
+    /// Normally, it has better performance, but not readable
+    /// </summary>
+    public class BinaryStorage<T> : IStorage<T>
+    {
+        private readonly IFileSystem _fileSystem;
+
+        // This storage helper returns whether or not to delete the binary storage items
+        private const int _binaryStorage = 0;
+        private StoragePowerToysVersionInfo _storageHelper;
+
+        public BinaryStorage(string filename)
+            : this(filename, new FileSystem())
+        {
+        }
+
+        public BinaryStorage(string filename, IFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+
+            const string directoryName = "Cache";
+            var path = _fileSystem.Path;
+            var directoryPath = path.Combine(Constant.DataDirectory, directoryName);
+            Helper.ValidateDirectory(directoryPath);
+
+            const string fileSuffix = ".cache";
+            FilePath = path.Combine(directoryPath, $"{filename}{fileSuffix}");
+        }
+
+        public string FilePath { get; }
+
+        public T TryLoad(T defaultData)
+        {
+            _storageHelper = new StoragePowerToysVersionInfo(FilePath, _binaryStorage);
+
+            // Depending on the version number of the previously installed PT Run, delete the cache if it is found to be incompatible
+            if (_storageHelper.ClearCache)
+            {
+                if (_fileSystem.File.Exists(FilePath))
+                {
+                    _fileSystem.File.Delete(FilePath);
+
+                    Log.Info($"Deleting cached data at <{FilePath}>", GetType());
+                }
+            }
+
+            if (_fileSystem.File.Exists(FilePath))
+            {
+                if (_fileSystem.FileInfo.FromFileName(FilePath).Length == 0)
+                {
+                    Log.Error($"Zero length cache file <{FilePath}>", GetType());
+
+                    Save(defaultData);
+                    return defaultData;
+                }
+
+                using (var stream = _fileSystem.FileStream.Create(FilePath, FileMode.Open))
+                {
+                    var d = Deserialize(stream, defaultData);
+                    return d;
+                }
+            }
+            else
+            {
+                Log.Info("Cache file not exist, load default data", GetType());
+
+                Save(defaultData);
+                return defaultData;
+            }
+        }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Suppressing this to enable FxCop. We are logging the exception, and going forward general exceptions should not be caught")]
+        private T Deserialize(Stream stream, T defaultData)
+        {
+            // http://stackoverflow.com/questions/2120055/binaryformatter-deserialize-gives-serializationexception
+            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+            BinaryFormatter binaryFormatter = new BinaryFormatter
+            {
+                AssemblyFormat = FormatterAssemblyStyle.Simple,
+            };
+
+            try
+            {
+                var t = ((T)binaryFormatter.Deserialize(stream)).NonNull();
+                return t;
+            }
+            catch (System.Exception e)
+            {
+                Log.Exception($"Deserialize error for file <{FilePath}>", e, GetType());
+
+                return defaultData;
+            }
+            finally
+            {
+                AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
+            }
+        }
+
+        private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        {
+            Assembly ayResult = null;
+            string sShortAssemblyName = args.Name.Split(',')[0];
+            Assembly[] ayAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (Assembly ayAssembly in ayAssemblies)
+            {
+                if (sShortAssemblyName == ayAssembly.FullName.Split(',')[0])
+                {
+                    ayResult = ayAssembly;
+                    break;
+                }
+            }
+
+            return ayResult;
+        }
+
+        public void Save(T data)
+        {
+            using (var stream = new FileStream(FilePath, FileMode.Create))
+            {
+                BinaryFormatter binaryFormatter = new BinaryFormatter
+                {
+                    AssemblyFormat = FormatterAssemblyStyle.Simple,
+                };
+
+                try
+                {
+                    binaryFormatter.Serialize(stream, data);
+                }
+                catch (SerializationException e)
+                {
+                    Log.Exception($"Serialize error for file <{FilePath}>", e, GetType());
+                }
+            }
+
+            _storageHelper.Close();
+            Log.Info($"Saving cached data at <{FilePath}>", GetType());
+        }
+    }
+}

src/modules/launcher/Wox.Infrastructure/Storage/IStorage`1.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Wox.Infrastructure.Storage
+{
+    public interface IStorage<T>
+    {
+        /// <summary>
+        /// Saves the data
+        /// </summary>
+        /// <param name="data">data to be saved</param>
+        void Save(T data);
+
+        /// <summary>
+        /// Attempts to load data, otherwise it will return the default provided
+        /// </summary>
+        /// <param name="defaultData">default data value</param>
+        /// <returns>The loaded data or default</returns>
+        T TryLoad(T defaultData);
+    }
+}

src/modules/launcher/Wox.Infrastructure/Storage/WoxJsonStorage`1.cs

@@ -13,12 +13,12 @@ namespace Wox.Infrastructure.Storage
         private static readonly IFileSystem FileSystem = new FileSystem();
         private static readonly IPath Path = FileSystem.Path;
 
-        public WoxJsonStorage(string fileName = "")
+        public WoxJsonStorage()
         {
             var directoryPath = Path.Combine(Constant.DataDirectory, DirectoryName);
             Helper.ValidateDirectory(directoryPath);
 
-            var filename = fileName != null && fileName.Length != 0 ? fileName : typeof(T).Name;
+            var filename = typeof(T).Name;
             FilePath = Path.Combine(directoryPath, $"{filename}{FileSuffix}");
         }
     }

src/modules/launcher/Wox.Infrastructure/Wox.Infrastructure.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 <Import Project="..\..\..\Version.props" />
   
   <PropertyGroup>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <UseWpf>true</UseWpf>