From 6571c57813fd2821c70eea4e470ca118a361cb2f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 29 Mar 2025 23:40:00 +0100 Subject: [PATCH] Depencency updates --- GatheringPathRenderer/packages.lock.json | 6 +-- GatheringPaths/packages.lock.json | 6 +-- .../QuestPathGenerator.Tests.csproj | 14 ++++-- QuestPathGenerator/QuestPathGenerator.csproj | 8 +-- QuestPathGenerator/packages.lock.json | 49 ++++++++++--------- QuestPaths/packages.lock.json | 6 +-- Questionable.Model/Questionable.Model.csproj | 2 +- Questionable.Model/packages.lock.json | 29 +++++++---- Questionable/Questionable.csproj | 8 +-- .../ConfigComponents/ConfigComponent.cs | 2 +- .../SinglePlayerDutyConfigComponent.cs | 3 +- Questionable/packages.lock.json | 44 ++++++++--------- 12 files changed, 98 insertions(+), 79 deletions(-) diff --git a/GatheringPathRenderer/packages.lock.json b/GatheringPathRenderer/packages.lock.json index 49dd2584..d1884a3a 100644 --- a/GatheringPathRenderer/packages.lock.json +++ b/GatheringPathRenderer/packages.lock.json @@ -892,8 +892,8 @@ }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==" }, "System.Text.RegularExpressions": { "type": "Transitive", @@ -1000,7 +1000,7 @@ "questionable.model": { "type": "Project", "dependencies": { - "System.Text.Json": "[8.0.5, )" + "System.Text.Json": "[9.0.3, )" } } } diff --git a/GatheringPaths/packages.lock.json b/GatheringPaths/packages.lock.json index 6502cfa1..0d3376be 100644 --- a/GatheringPaths/packages.lock.json +++ b/GatheringPaths/packages.lock.json @@ -4,13 +4,13 @@ "net9.0-windows7.0": { "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==" }, "questionable.model": { "type": "Project", "dependencies": { - "System.Text.Json": "[8.0.5, )" + "System.Text.Json": "[9.0.3, )" } } } diff --git a/QuestPathGenerator.Tests/QuestPathGenerator.Tests.csproj b/QuestPathGenerator.Tests/QuestPathGenerator.Tests.csproj index dea571d5..78d5249b 100644 --- a/QuestPathGenerator.Tests/QuestPathGenerator.Tests.csproj +++ b/QuestPathGenerator.Tests/QuestPathGenerator.Tests.csproj @@ -12,10 +12,16 @@ - - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/QuestPathGenerator/QuestPathGenerator.csproj b/QuestPathGenerator/QuestPathGenerator.csproj index 9c862ec9..10fb25e7 100644 --- a/QuestPathGenerator/QuestPathGenerator.csproj +++ b/QuestPathGenerator/QuestPathGenerator.csproj @@ -17,16 +17,16 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/QuestPathGenerator/packages.lock.json b/QuestPathGenerator/packages.lock.json index 44b2a011..c789b0bd 100644 --- a/QuestPathGenerator/packages.lock.json +++ b/QuestPathGenerator/packages.lock.json @@ -4,30 +4,30 @@ ".NETStandard,Version=v2.0": { "Json.More.Net": { "type": "Direct", - "requested": "[2.0.2, )", - "resolved": "2.0.2", - "contentHash": "izscdjjk8EAHDBCjyz7V7n77SzkrSjh/hUGV6cyR6PlVdjYDh5ohc8yqvwSqJ9+6Uof8W6B24dIHlDKD+I1F8A==", + "requested": "[2.1.1, )", + "resolved": "2.1.1", + "contentHash": "ZXAKl2VsdnIZeUo1PFII3Oi1m1L4YQjEyDjygHfHln5vgsjgIo749X6xWkv7qFYp8RROES+vOEfDcvvoVgs8kA==", "dependencies": { - "System.Text.Json": "8.0.4" + "System.Text.Json": "9.0.0" } }, "JsonPointer.Net": { "type": "Direct", - "requested": "[5.0.2, )", - "resolved": "5.0.2", - "contentHash": "H/OtixKadr+ja1j7Fru3WG56V9zP0AKT1Bd0O7RWN/zH1bl8ZIwW9aCa4+xvzuVvt4SPmrvBu3G6NpAkNOwNAA==", + "requested": "[5.3.1, )", + "resolved": "5.3.1", + "contentHash": "3e2OJjU0OaE26XC/klgxbJuXvteFWTDJIJv0ITYWcJEoskq7jzUwPSC1s0iz4wPPQnfN7vwwFmg2gJfwRAPwgw==", "dependencies": { "Humanizer.Core": "2.14.1", - "Json.More.Net": "2.0.1.2" + "Json.More.Net": "2.1.1" } }, "JsonSchema.Net": { "type": "Direct", - "requested": "[7.1.2, )", - "resolved": "7.1.2", - "contentHash": "tvM82Wpsyk+C5aUWkqPZLo2ANDjEfCoDa9R24k7jRkCrwxbXnSBb7NpU1pz0ufp6qw+jIekHD9xJdUkjUtnZxQ==", + "requested": "[7.3.4, )", + "resolved": "7.3.4", + "contentHash": "7GggWrdzKrtGWETRn3dcMnmuLSyWaDkBK94TK80LEHQEVz4bmsQc7FYO7qL40RDdZU2YPz5d98aT9lW5OYExuA==", "dependencies": { - "JsonPointer.Net": "5.0.0" + "JsonPointer.Net": "5.3.1" } }, "Microsoft.CodeAnalysis.Analyzers": { @@ -68,15 +68,16 @@ }, "System.Text.Json": { "type": "Direct", - "requested": "[8.0.5, )", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "requested": "[9.0.3, )", + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "Microsoft.Bcl.AsyncInterfaces": "9.0.3", "System.Buffers": "4.5.1", + "System.IO.Pipelines": "9.0.3", "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", + "System.Text.Encodings.Web": "9.0.3", "System.Threading.Tasks.Extensions": "4.5.4" } }, @@ -87,8 +88,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "resolved": "9.0.3", + "contentHash": "oFFX9Ls8dnNUBCD9yzRzHTY8tqvv+CiX43B8L8DjrM8BqYTAlORYaJf6+KXNtSC2bD1135yV8OxzcZFaluow5w==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } @@ -189,8 +190,8 @@ }, "System.IO.Pipelines": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==", + "resolved": "9.0.3", + "contentHash": "aP1Qh9llcEmo0qN+VKvVDHFMe5Cqpfb1VjhBO7rjmxCXtLs3IfVSOiNqqLBZ/4Qbcr4J0SDdJq9S7EKAGpnwEA==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -237,8 +238,8 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "resolved": "9.0.3", + "contentHash": "5L+iI4fBMtGwt4FHLQh40/rgdbxnw6lHaLkR3gbaHG97TohzUv+z/oP03drsTR1lKCLhOkp40cFnHYOQLtpT5A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", @@ -264,7 +265,7 @@ "questionable.model": { "type": "Project", "dependencies": { - "System.Text.Json": "[8.0.5, )" + "System.Text.Json": "[9.0.3, )" } } } diff --git a/QuestPaths/packages.lock.json b/QuestPaths/packages.lock.json index 6502cfa1..0d3376be 100644 --- a/QuestPaths/packages.lock.json +++ b/QuestPaths/packages.lock.json @@ -4,13 +4,13 @@ "net9.0-windows7.0": { "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==" }, "questionable.model": { "type": "Project", "dependencies": { - "System.Text.Json": "[8.0.5, )" + "System.Text.Json": "[9.0.3, )" } } } diff --git a/Questionable.Model/Questionable.Model.csproj b/Questionable.Model/Questionable.Model.csproj index 13afcd43..29b952ae 100644 --- a/Questionable.Model/Questionable.Model.csproj +++ b/Questionable.Model/Questionable.Model.csproj @@ -11,7 +11,7 @@ - + diff --git a/Questionable.Model/packages.lock.json b/Questionable.Model/packages.lock.json index 7fd9471e..43fe9cfa 100644 --- a/Questionable.Model/packages.lock.json +++ b/Questionable.Model/packages.lock.json @@ -13,22 +13,23 @@ }, "System.Text.Json": { "type": "Direct", - "requested": "[8.0.5, )", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==", + "requested": "[9.0.3, )", + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==", "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "Microsoft.Bcl.AsyncInterfaces": "9.0.3", "System.Buffers": "4.5.1", + "System.IO.Pipelines": "9.0.3", "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "8.0.0", + "System.Text.Encodings.Web": "9.0.3", "System.Threading.Tasks.Extensions": "4.5.4" } }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==", + "resolved": "9.0.3", + "contentHash": "oFFX9Ls8dnNUBCD9yzRzHTY8tqvv+CiX43B8L8DjrM8BqYTAlORYaJf6+KXNtSC2bD1135yV8OxzcZFaluow5w==", "dependencies": { "System.Threading.Tasks.Extensions": "4.5.4" } @@ -43,6 +44,16 @@ "resolved": "4.5.1", "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "9.0.3", + "contentHash": "aP1Qh9llcEmo0qN+VKvVDHFMe5Cqpfb1VjhBO7rjmxCXtLs3IfVSOiNqqLBZ/4Qbcr4J0SDdJq9S7EKAGpnwEA==", + "dependencies": { + "System.Buffers": "4.5.1", + "System.Memory": "4.5.5", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, "System.Memory": { "type": "Transitive", "resolved": "4.5.5", @@ -65,8 +76,8 @@ }, "System.Text.Encodings.Web": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==", + "resolved": "9.0.3", + "contentHash": "5L+iI4fBMtGwt4FHLQh40/rgdbxnw6lHaLkR3gbaHG97TohzUv+z/oP03drsTR1lKCLhOkp40cFnHYOQLtpT5A==", "dependencies": { "System.Buffers": "4.5.1", "System.Memory": "4.5.5", diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index 1285fc24..f9044872 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/Questionable/Windows/ConfigComponents/ConfigComponent.cs b/Questionable/Windows/ConfigComponents/ConfigComponent.cs index d8515634..a44ef934 100644 --- a/Questionable/Windows/ConfigComponents/ConfigComponent.cs +++ b/Questionable/Windows/ConfigComponents/ConfigComponent.cs @@ -66,7 +66,7 @@ internal abstract class ConfigComponent return Encoding.UTF8.GetString(ptr, byteCount); } - protected static void DrawNotes(bool enabledByDefault, IReadOnlyList notes) + protected static void DrawNotes(bool enabledByDefault, IEnumerable notes) { using var color = new ImRaii.Color(); color.Push(ImGuiCol.TextDisabled, !enabledByDefault ? ImGuiColors.DalamudYellow : ImGuiColors.ParsedBlue); diff --git a/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs b/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs index 27acb836..ff756a28 100644 --- a/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs +++ b/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Collections.ObjectModel; using System.Linq; using System.Numerics; using Dalamud.Game.Text; @@ -517,7 +518,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent public uint TerritoryId => ContentFinderConditionData.TerritoryId; public byte Index => Options.Index; public bool EnabledByDefault => Options.Enabled; - public IReadOnlyList Notes => Options.Notes; + public ReadOnlyCollection Notes => Options.Notes.AsReadOnly(); public bool IsLimsaStart => ContentFinderConditionId is 332 or 333 or 313 or 334; public bool IsGridaniaStart => ContentFinderConditionId is 296 or 297 or 299 or 298; diff --git a/Questionable/packages.lock.json b/Questionable/packages.lock.json index ff1083a8..a6e8ea69 100644 --- a/Questionable/packages.lock.json +++ b/Questionable/packages.lock.json @@ -25,26 +25,26 @@ }, "JetBrains.Annotations": { "type": "Direct", - "requested": "[2024.2.0, )", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "requested": "[2024.3.0, )", + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "JsonSchema.Net": { "type": "Direct", - "requested": "[7.1.2, )", - "resolved": "7.1.2", - "contentHash": "tvM82Wpsyk+C5aUWkqPZLo2ANDjEfCoDa9R24k7jRkCrwxbXnSBb7NpU1pz0ufp6qw+jIekHD9xJdUkjUtnZxQ==", + "requested": "[7.3.4, )", + "resolved": "7.3.4", + "contentHash": "7GggWrdzKrtGWETRn3dcMnmuLSyWaDkBK94TK80LEHQEVz4bmsQc7FYO7qL40RDdZU2YPz5d98aT9lW5OYExuA==", "dependencies": { - "JsonPointer.Net": "5.0.0" + "JsonPointer.Net": "5.3.1" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "requested": "[9.0.3, )", + "resolved": "9.0.3", + "contentHash": "lDbxJpkl6X8KZGpkAxgrrthQ42YeiR0xjPp7KPx+sCPc3ZbpaIbjzd0QQ+9kDdK2RU2DOl3pc6tQyAgEZY3V0A==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.3" } }, "Microsoft.SourceLink.Gitea": { @@ -59,9 +59,9 @@ }, "System.Text.Json": { "type": "Direct", - "requested": "[8.0.5, )", - "resolved": "8.0.5", - "contentHash": "0f1B50Ss7rqxXiaBJyzUu9bWFOO2/zSlifZ/UNMdiIpDYe4cY4LQQicP4nirK1OS31I43rn062UIJ1Q9bpmHpg==" + "requested": "[9.0.3, )", + "resolved": "9.0.3", + "contentHash": "r2JRkLjsYrq5Dpo7+y3Wa73OfirZPdVhxiTJWwZ+oJM7FOAe0LkM3GlH+pgkNRdd1G1kwUbmRCdmh4uoaWwu1g==" }, "Humanizer.Core": { "type": "Transitive", @@ -70,16 +70,16 @@ }, "Json.More.Net": { "type": "Transitive", - "resolved": "2.0.1.2", - "contentHash": "uF3QeiaXEfH92emz0/BWUiNtMSfxIIvgynuB0Bf1vF4s8eWTcZitBx9l+g/FDaJk5XxqBv9buQXizXKQcXFG1w==" + "resolved": "2.1.1", + "contentHash": "ZXAKl2VsdnIZeUo1PFII3Oi1m1L4YQjEyDjygHfHln5vgsjgIo749X6xWkv7qFYp8RROES+vOEfDcvvoVgs8kA==" }, "JsonPointer.Net": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "fm4T5w20AY6C+p5/pJr0vrXRNGgtSfHl34I1LxC9zdPwS9S3j0GiR1Mz/CVPWKDXXGDpCt1APHpCq7kn5adCfA==", + "resolved": "5.3.1", + "contentHash": "3e2OJjU0OaE26XC/klgxbJuXvteFWTDJIJv0ITYWcJEoskq7jzUwPSC1s0iz4wPPQnfN7vwwFmg2gJfwRAPwgw==", "dependencies": { "Humanizer.Core": "2.14.1", - "Json.More.Net": "2.0.1.2" + "Json.More.Net": "2.1.1" } }, "Microsoft.Build.Tasks.Git": { @@ -89,8 +89,8 @@ }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "9.0.3", + "contentHash": "TfaHPSe39NyL2wxkisRxXK7xvHGZYBZ+dy3r+mqGvnxKgAPdHkMu3QMQZI4pquP6W5FIQBqs8FJpWV8ffCgDqQ==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", @@ -147,7 +147,7 @@ "questionable.model": { "type": "Project", "dependencies": { - "System.Text.Json": "[8.0.5, )" + "System.Text.Json": "[9.0.3, )" } }, "questpaths": { -- 2.30.2