diff --git a/Directory.Build.props b/Directory.Build.props index a5545af1248..e3a8de0b321 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,5 +3,6 @@ true false + true \ No newline at end of file diff --git a/Flow.Launcher.Core/packages.lock.json b/Flow.Launcher.Core/packages.lock.json index 5e9abc24cf4..3939f9b2a93 100644 --- a/Flow.Launcher.Core/packages.lock.json +++ b/Flow.Launcher.Core/packages.lock.json @@ -23,12 +23,24 @@ "resolved": "3.4.3", "contentHash": "REjInKnQ0OrhjjtSMPQtLtdURctCroB4L8Sd2gjTOYDysklvsdnrStx1tHS7uLv+fSyFF3aazZmo5Ka0v1oz/w==" }, + "Microsoft.DotNet.ILCompiler": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "cMwVh5hsxAhv+oMHQdgcXodt2kDpfviofBO4IXupSAHJW2vZOZOOIhvPWRGO6NeGcP8SR4OpSwktRqb0i79KFA==" + }, "Microsoft.IO.RecyclableMemoryStream": { "type": "Direct", "requested": "[3.0.1, )", "resolved": "3.0.1", "contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g==" }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "rd1CbIsMtVPtZNTIVD6Xydue//klYOOQIDpRgu3BHtv17AlpRs74/6QFbcYgMm/jL+naVU2T3OFLxVSLV5lQLQ==" + }, "SemanticVersioning": { "type": "Direct", "requested": "[3.0.0, )", diff --git a/Flow.Launcher.Infrastructure/packages.lock.json b/Flow.Launcher.Infrastructure/packages.lock.json index abd250f7c44..7de8667f535 100644 --- a/Flow.Launcher.Infrastructure/packages.lock.json +++ b/Flow.Launcher.Infrastructure/packages.lock.json @@ -45,6 +45,18 @@ "MemoryPack.Generator": "1.21.4" } }, + "Microsoft.DotNet.ILCompiler": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "cMwVh5hsxAhv+oMHQdgcXodt2kDpfviofBO4IXupSAHJW2vZOZOOIhvPWRGO6NeGcP8SR4OpSwktRqb0i79KFA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "rd1CbIsMtVPtZNTIVD6Xydue//klYOOQIDpRgu3BHtv17AlpRs74/6QFbcYgMm/jL+naVU2T3OFLxVSLV5lQLQ==" + }, "Microsoft.VisualStudio.Threading": { "type": "Direct", "requested": "[17.14.15, )", diff --git a/Flow.Launcher.Plugin/packages.lock.json b/Flow.Launcher.Plugin/packages.lock.json index af835c59870..9e6e2ce5485 100644 --- a/Flow.Launcher.Plugin/packages.lock.json +++ b/Flow.Launcher.Plugin/packages.lock.json @@ -14,6 +14,18 @@ "resolved": "2024.3.0", "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, + "Microsoft.DotNet.ILCompiler": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "cMwVh5hsxAhv+oMHQdgcXodt2kDpfviofBO4IXupSAHJW2vZOZOOIhvPWRGO6NeGcP8SR4OpSwktRqb0i79KFA==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "rd1CbIsMtVPtZNTIVD6Xydue//klYOOQIDpRgu3BHtv17AlpRs74/6QFbcYgMm/jL+naVU2T3OFLxVSLV5lQLQ==" + }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", diff --git a/Flow.Launcher/packages.lock.json b/Flow.Launcher/packages.lock.json index 32b78c3348c..75eb86b3979 100644 --- a/Flow.Launcher/packages.lock.json +++ b/Flow.Launcher/packages.lock.json @@ -69,6 +69,12 @@ "Svg": "3.0.84" } }, + "Microsoft.DotNet.ILCompiler": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "cMwVh5hsxAhv+oMHQdgcXodt2kDpfviofBO4IXupSAHJW2vZOZOOIhvPWRGO6NeGcP8SR4OpSwktRqb0i79KFA==" + }, "Microsoft.Extensions.DependencyInjection": { "type": "Direct", "requested": "[9.0.7, )", @@ -108,6 +114,12 @@ "Microsoft.Extensions.Options": "9.0.7" } }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[9.0.8, )", + "resolved": "9.0.8", + "contentHash": "rd1CbIsMtVPtZNTIVD6Xydue//klYOOQIDpRgu3BHtv17AlpRs74/6QFbcYgMm/jL+naVU2T3OFLxVSLV5lQLQ==" + }, "Microsoft.Toolkit.Uwp.Notifications": { "type": "Direct", "requested": "[7.1.3, )", diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs index 20e78f71774..93db1e22ca6 100644 --- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs +++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/JsonSettingsListHelper.cs @@ -39,13 +39,10 @@ internal static IEnumerable ReadAllPossibleSettings() throw new Exception("stream is null"); } - var options = new JsonSerializerOptions(); - options.Converters.Add(new JsonStringEnumConverter()); - using var reader = new StreamReader(stream); var text = reader.ReadToEnd(); - settingsList = JsonSerializer.Deserialize>(text, options); + settingsList = JsonSerializer.Deserialize(text, MyJsonContext.Default.IEnumerableWindowsSetting); } catch (Exception exception) { @@ -55,4 +52,13 @@ internal static IEnumerable ReadAllPossibleSettings() return settingsList ?? Enumerable.Empty(); } } + + [JsonSourceGenerationOptions( + Converters = new[] { typeof(JsonStringEnumConverter) }, + PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase + )] + [JsonSerializable(typeof(IEnumerable))] + internal partial class MyJsonContext : JsonSerializerContext + { + } }