diff --git a/Directory.Packages.props b/Directory.Packages.props index 01046d3925..f96b737b00 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,9 +4,9 @@ false - 5.7.0-1.26207.106 - 10.0.6 - 2.23.0 + 5.7.0-1.26230.115 + 10.0.8 + 2.24.0 @@ -33,16 +33,16 @@ - + - + - + @@ -55,7 +55,7 @@ - + diff --git a/ICSharpCode.BamlDecompiler/packages.lock.json b/ICSharpCode.BamlDecompiler/packages.lock.json index 282fbdc5dc..a8c675b2c8 100644 --- a/ICSharpCode.BamlDecompiler/packages.lock.json +++ b/ICSharpCode.BamlDecompiler/packages.lock.json @@ -10,9 +10,9 @@ }, "TomsToolbox.Composition.Analyzer": { "type": "Direct", - "requested": "[2.23.0, )", - "resolved": "2.23.0", - "contentHash": "WHvTkPV5AI9FQY7MB7PUWgIkm69NEiCmuG0A7cVXFF/wNQ0xI5YjS60a20vM1Z1Sg+mDDkZ4452hwFGaky0Txg==" + "requested": "[2.24.0, )", + "resolved": "2.24.0", + "contentHash": "dKHqW1MeAMnDIbtx8qDTsGwy/7LUiQ3ccdzHX0PzCh1r98Lgl/1deIky9+ojZO0K5HjeA7uE+eW9/h+v7EOIBA==" }, "icsharpcode.decompiler": { "type": "Project", @@ -23,13 +23,13 @@ }, "System.Collections.Immutable": { "type": "CentralTransitive", - "requested": "[10.0.6, )", + "requested": "[10.0.8, )", "resolved": "9.0.0", "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" }, "System.Reflection.Metadata": { "type": "CentralTransitive", - "requested": "[10.0.6, )", + "requested": "[10.0.8, )", "resolved": "9.0.0", "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==" } diff --git a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs index 29d4df95e6..3c88f4a22a 100644 --- a/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs +++ b/ICSharpCode.Decompiler.Tests/Helpers/Tester.cs @@ -96,7 +96,7 @@ public static partial class Tester { public const string CurrentNetCoreVersion = "11.0"; public const string CurrentNetCoreAppVersion = ".NETCoreApp,Version=v11.0"; - public const string CurrentNetCoreRefAsmVersion = "11.0.0-preview.3.26207.106"; + public const string CurrentNetCoreRefAsmVersion = "11.0.0-preview.4.26230.115"; public static readonly string TesterPath; public static readonly string TestCasePath; diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 885efd7eae..aea2cfe174 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -85,11 +85,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs b/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs index cca9847df5..db8a8d4d7f 100644 --- a/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs +++ b/ICSharpCode.Decompiler/Properties/DecompilerVersionInfo.template.cs @@ -1,8 +1,8 @@ public static class DecompilerVersionInfo { public const string Major = "10"; - public const string Minor = "0"; - public const string Build = "1"; + public const string Minor = "1"; + public const string Build = "0"; public const string Revision = "$INSERTREVISION$"; public const string VersionName = null; diff --git a/ICSharpCode.Decompiler/packages.lock.json b/ICSharpCode.Decompiler/packages.lock.json index 5335e8c63e..bfbd9a60c2 100644 --- a/ICSharpCode.Decompiler/packages.lock.json +++ b/ICSharpCode.Decompiler/packages.lock.json @@ -4,9 +4,9 @@ ".NETStandard,Version=v2.0": { "Microsoft.CodeAnalysis.NetAnalyzers": { "type": "Direct", - "requested": "[10.0.202, )", - "resolved": "10.0.202", - "contentHash": "ZC4WsiOnzyUHIZ3uGN4popaYPh2NgYcXZ/CpMpAb3mVF/HvBGlBtlredzZMKgcHqlm+ygqJh6qfhUSc/OJ0hWQ==" + "requested": "[10.0.300, )", + "resolved": "10.0.300", + "contentHash": "WsPMVkfrmoZ0qKSasuVtYaxnd/MvqPOz7ZXld5NzyF8/kwwtPGjtmEKp4xDHG+pj4QqETpSVfkmKa0UFu/n1GQ==" }, "Microsoft.Sbom.Targets": { "type": "Direct", @@ -16,13 +16,13 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[10.0.202, )", - "resolved": "10.0.202", - "contentHash": "vRm3w0AWndnqt8X73qoWTdD/qp7o+bYMCufl7hSiQUSqeI3WKdqA/ElE6MCUscy84FX8HCMcK2EJCtTm+4bdbw==", + "requested": "[10.0.300, )", + "resolved": "10.0.300", + "contentHash": "QzCtLkXVb3l4IxcpvJCbzUwMLihAmLN6vVLjQGSzYSF8d2dvXxqJAZk83RV3gYnp2egz8jRMgSR2woY3vOahTA==", "dependencies": { - "Microsoft.Build.Tasks.Git": "10.0.202", - "Microsoft.SourceLink.Common": "10.0.202", - "System.IO.Hashing": "10.0.6" + "Microsoft.Build.Tasks.Git": "10.0.300", + "Microsoft.SourceLink.Common": "10.0.300", + "System.IO.Hashing": "10.0.8" } }, "NETStandard.Library": { @@ -62,10 +62,10 @@ }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "10.0.202", - "contentHash": "HXAW7dToPLi6lHN4TJz1FfxLYfPS3EF20YrrZxQ9xbwbjLkFXJ+SwkuuILoAdCWTNHhHfa5oqOsrOEQX5s+eMg==", + "resolved": "10.0.300", + "contentHash": "P0kaQwVZx4xIUe2FtrLyBadYNXuAljttJUPvjBYRuHhPE8L77L42KakLDkaADRiUrGspoLcMwayjrbQhYTr0zA==", "dependencies": { - "System.IO.Hashing": "10.0.6" + "System.IO.Hashing": "10.0.8" } }, "Microsoft.NETCore.Platforms": { @@ -75,8 +75,8 @@ }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "10.0.202", - "contentHash": "g8E67huS0Slt6iJiUG1uj2N4NBo/q68Q1y1H4nFu1Cn4AOp6S5D8AeGLhGMzBT+JmNCjiGTvKco2qkbe4F31tQ==" + "resolved": "10.0.300", + "contentHash": "0jlkXaUGjYlWTIVPve5MftjKHnT3SlAtq9BCLV4J9IjdPrxV/+4rMlBSjfr1khG8/GC6KGojjola8E1VvWF0qQ==" }, "System.Buffers": { "type": "Transitive", @@ -85,8 +85,8 @@ }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "lbMLkqFekDR4DeFd26eEfrG2HlvixIfs22uk/e2+9/NJ7WxMycVVakcQpuJvvqgc9XxwEgSd/Td+dZA+TjDDwA==", + "resolved": "10.0.8", + "contentHash": "+dJsbPJ3FyUbTZNplFj0RCKePFizmv6ewDV46JE9q/IVH4c3xTCftHfHelLsAKf0jryIPqgMb5GpS0x7TAY3mg==", "dependencies": { "System.Buffers": "4.6.1", "System.Memory": "4.6.3" diff --git a/ICSharpCode.ILSpyCmd/README.md b/ICSharpCode.ILSpyCmd/README.md index f86ef252af..e523fa1220 100644 --- a/ICSharpCode.ILSpyCmd/README.md +++ b/ICSharpCode.ILSpyCmd/README.md @@ -9,8 +9,8 @@ dotnet tool install --global ilspycmd Help output (`ilspycmd --help`): ``` -ilspycmd: 9.0.0.7847 -ICSharpCode.Decompiler: 9.0.0.7847 +ilspycmd: 10.1.0.8361 +ICSharpCode.Decompiler: 10.1.0.8361 dotnet tool for decompiling .NET assemblies and generating portable PDBs @@ -32,13 +32,21 @@ Options: -usepdb|--use-varnames-from-pdb Use variable names from PDB. -l|--list Lists all entities of the specified type(s). Valid types: c(lass), i(nterface), s(truct), d(elegate), e(num) + --list-resources Lists all embedded resources in the assembly. Entries inside .resources + containers are listed individually as '/'. + --resource Extract a single resource by name (as printed by --list-resources). Resources + whose name ends with '.baml' are decompiled to XAML. + --decompile-baml When used with -p, decompile BAML resources to XAML files (Page items) instead + of leaving them as raw byte streams. -lv|--languageversion C# Language version: CSharp1, CSharp2, CSharp3, CSharp4, CSharp5, CSharp6, CSharp7, CSharp7_1, CSharp7_2, CSharp7_3, CSharp8_0, CSharp9_0, CSharp10_0, - Preview or Latest + CSharp11_0, CSharp12_0, CSharp13_0, Preview or Latest Allowed values are: CSharp1, CSharp2, CSharp3, CSharp4, CSharp5, CSharp6, CSharp7, CSharp7_1, CSharp7_2, CSharp7_3, CSharp8_0, CSharp9_0, CSharp10_0, - CSharp11_0, Preview, CSharp12_0, Latest. + CSharp11_0, CSharp12_0, CSharp13_0, CSharp14_0, Preview, Latest. Default value is: Latest. + --ilspy-settingsfile Path to an ILSpy settings file. + -ds|--decompiler-setting Set a decompiler setting. Use multiple times to set multiple settings. -r|--referencepath Path to a directory containing dependencies of the assembly that is being decompiled. --no-dead-code Remove dead code. @@ -92,6 +100,15 @@ Examples: Generate a HTML diagrammer containing filtered type info into a custom output folder (including types in the LightJson namespace while excluding types in nested LightJson.Serialization namespace) ilspycmd sample.dll --generate-diagrammer -o c:\diagrammer --generate-diagrammer-include LightJson\\..+ --generate-diagrammer-exclude LightJson\\.Serialization\\..+ + + List all embedded resources in a WPF assembly (including BAML entries inside .g.resources containers). + ilspycmd sample.dll --list-resources + + Extract a single resource. If the name ends with .baml, the output is decompiled XAML; otherwise raw bytes. + ilspycmd sample.dll --resource sample.g.resources/mainwindow.baml -o c:\decompiled + + Decompile assembly as a compilable project and convert all BAML resources to XAML Page items. + ilspycmd sample.dll -p -o c:\decompiled --decompile-baml ``` ## Generate HTML diagrammers diff --git a/ICSharpCode.ILSpyCmd/packages.lock.json b/ICSharpCode.ILSpyCmd/packages.lock.json index d8be5ca212..07551e4006 100644 --- a/ICSharpCode.ILSpyCmd/packages.lock.json +++ b/ICSharpCode.ILSpyCmd/packages.lock.json @@ -15,279 +15,279 @@ }, "Microsoft.Extensions.Hosting": { "type": "Direct", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "ygrWasQx4OgbUfJpA2PQHon+c5yQWSoIpG2+f2uyEGs8ciTRoyn+Ne12e9zp6VZ2GNNb8CnUoxq1ika66tjVCA==", - "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Configuration.Binder": "10.0.6", - "Microsoft.Extensions.Configuration.CommandLine": "10.0.6", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.6", - "Microsoft.Extensions.Configuration.FileExtensions": "10.0.6", - "Microsoft.Extensions.Configuration.Json": "10.0.6", - "Microsoft.Extensions.Configuration.UserSecrets": "10.0.6", - "Microsoft.Extensions.DependencyInjection": "10.0.6", - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Diagnostics": "10.0.6", - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6", - "Microsoft.Extensions.FileProviders.Physical": "10.0.6", - "Microsoft.Extensions.Hosting.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging.Configuration": "10.0.6", - "Microsoft.Extensions.Logging.Console": "10.0.6", - "Microsoft.Extensions.Logging.Debug": "10.0.6", - "Microsoft.Extensions.Logging.EventLog": "10.0.6", - "Microsoft.Extensions.Logging.EventSource": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "VfEyM2BipThcSd0GG/FS2ZPCVCTiosVq2zLKEDsfeMIg78sOVZPEmS7CgWlb+dqTlgXvLSL4OG2q6sM4xRhHNg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Configuration.Binder": "10.0.8", + "Microsoft.Extensions.Configuration.CommandLine": "10.0.8", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.8", + "Microsoft.Extensions.Configuration.FileExtensions": "10.0.8", + "Microsoft.Extensions.Configuration.Json": "10.0.8", + "Microsoft.Extensions.Configuration.UserSecrets": "10.0.8", + "Microsoft.Extensions.DependencyInjection": "10.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Diagnostics": "10.0.8", + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8", + "Microsoft.Extensions.FileProviders.Physical": "10.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging.Configuration": "10.0.8", + "Microsoft.Extensions.Logging.Console": "10.0.8", + "Microsoft.Extensions.Logging.Debug": "10.0.8", + "Microsoft.Extensions.Logging.EventLog": "10.0.8", + "Microsoft.Extensions.Logging.EventSource": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8" } }, "NuGet.Protocol": { "type": "Direct", - "requested": "[7.3.0, )", - "resolved": "7.3.0", - "contentHash": "QWx4Fko06Act+gVhB9UUc8Hzt0fnA8qQhD5SFn/xEis2ZZVzmatHmMdsc0SV7tyvCUlfG8DzQzYLF7fF4LvTyA==", + "requested": "[7.6.0, )", + "resolved": "7.6.0", + "contentHash": "Ccb9dJG9hW0FdHFjXoHmhJBBJRYSCeSJArLdZjyZj6/FEAIKezLn75KFQNrTPE5UiAp4HVrjBizufZ/0IXhfKQ==", "dependencies": { - "NuGet.Packaging": "7.3.0" + "NuGet.Packaging": "7.6.0" } }, "System.Security.Cryptography.Pkcs": { "type": "Direct", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "88tquaGJ1htm4DHWS6x9jwER7sFET2SVRN7HqO1FYZwE0diDcUmz0ajhVa8ZD2HGhDJBueSPjP/gqyP3gXtT2A==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "2wOycCqMyg9Tu+SDP03FFwDEWBni/3xOKgt0bRXplOvyeIcUJmWO7m3gTCF2mIdtQLROLtOP5VwWRT8YBwP/bA==" }, "TomsToolbox.Composition.Analyzer": { "type": "Direct", - "requested": "[2.23.0, )", - "resolved": "2.23.0", - "contentHash": "WHvTkPV5AI9FQY7MB7PUWgIkm69NEiCmuG0A7cVXFF/wNQ0xI5YjS60a20vM1Z1Sg+mDDkZ4452hwFGaky0Txg==" + "requested": "[2.24.0, )", + "resolved": "2.24.0", + "contentHash": "dKHqW1MeAMnDIbtx8qDTsGwy/7LUiQ3ccdzHX0PzCh1r98Lgl/1deIky9+ojZO0K5HjeA7uE+eW9/h+v7EOIBA==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "a7bA7IT3ngIgcOMb/2MVH5CcfSxUCeQ6QXWS1Vt6oFpzLTH3U1+J2Xtc64Uw3whX9akYG8eR/UQeEzxo64zZLg==", + "resolved": "10.0.8", + "contentHash": "I63esIFbL3h5pSt7gXpXOlmcwDmYBUoYNEglKfDPFUqtYvSV84f2l28hO2lfVXsV0wdlplgAM7IVz16matapSg==", "dependencies": { - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "h22Fm4VxRmr4ty9rxJaW0i51xD56Bl5QhQ2hsGY2vl+6FioWmBhkpg3B78XQaK25N+hE41gZLZuYKGQS+OGbdw==", + "resolved": "10.0.8", + "contentHash": "R3NN1X+kVu14uoxLEW6sBSQyhogDSbaOQzILnCtuXxBN4hx22AgjWPwZX6v/suERFkEDgU1lk12AglHTrUxhlw==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Configuration.CommandLine": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "QIhi6cJMfeGBGs36DGc+3k5yYFAc9TAk3TN3WaommALXVv+syLSIkFwDgXDtrXvAgvFwOrRjxWpzJ88TLD1uhA==", + "resolved": "10.0.8", + "contentHash": "nQXq1a4MiInYh+0VF9fguxAl06q2ftmOyYQ+5e933s4rk57xjgkbTjUdFUySzjrcrvDeWsSqlZB+TE8+TbM2HA==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Configuration.EnvironmentVariables": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "ZqkqIq6AXCBrLHqLGpjv0otGo0Dx1rF1UdDuVWDiog8jXuRwb3IH59fDONIxUschwDcYaD5xftrPCWdH1YD6lQ==", + "resolved": "10.0.8", + "contentHash": "bVGqctAfPGfTxJvNp8pMshtvpsUj6r6JkeiCNVIGVYO5gBxuxdN0Lbr25kEvE/zXdctkEc44g8HssnPgDnFGVA==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Configuration.FileExtensions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "hils30RkqBbtQVupvgUr7sgxJUYPc6YMEDge1QAXGTOhbRlqk2I0OH+BWMSsQjYnbGX2Ytl6EkrLgu9im6vE0w==", + "resolved": "10.0.8", + "contentHash": "1g9mzuu8gIHkjYb0jLxOTQVl/QDG5nn0b0JzgT/gbgNKr6gXZzxOHRAsdYRc1eDApB7LdHR8uK5vQrNjIQdRrQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6", - "Microsoft.Extensions.FileProviders.Physical": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8", + "Microsoft.Extensions.FileProviders.Physical": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Configuration.UserSecrets": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "DBuOHuzQitvowdS06xaHaOQl1Tcy8D+vU/FNAClkMPB23skPDbmN14t0ijJlQUGC9o10u+x+xVEsQk30ywYFtQ==", + "resolved": "10.0.8", + "contentHash": "6XTfFOnf27WY8kEeZkTZ4YNn0t+imgvdQ0YaAdR4vgURKATo9bCaVJ1KB71IOJAQtJP7Elb53VHlTNXg2CtSsA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Configuration.Json": "10.0.6", - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6", - "Microsoft.Extensions.FileProviders.Physical": "10.0.6" + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Configuration.Json": "10.0.8", + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8", + "Microsoft.Extensions.FileProviders.Physical": "10.0.8" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "poUvwtf92bEs8uBH3aRRs/ZgiAw+Z485EU7TtVPBt//MmD0uMPERe7+v3Ur7lpD8XgIEDL9sDoTBcW1LMG97CQ==", + "resolved": "10.0.8", + "contentHash": "daf62xHIrq8pnE709hgaZZN9tSam9TGGepWe1+bE6V3GEuVwJiMs6ib+38lfMCyAJAHiX0vapxBhsuMSV7U+cg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Diagnostics": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "vbigpAOKX+Bbm2uJQ/AqXqONEPPB3ZYkynRT24vo5ZWF1rzKPtVjpkQkJx5qTGp2dqNV5In9QqboayqmKdvGUA==", + "resolved": "10.0.8", + "contentHash": "uduyw9d3Fi+sbredO5drA1S44AQS2FRNFyn72UmB2vmQIO1qaXprpp1U/2lYhYi8yFdVERfY9sy/pxw/qPOU9w==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.6", - "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.8", + "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.8" } }, "Microsoft.Extensions.Diagnostics.Abstractions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "L98Xe5C+xyKytLNLiEyQ0rcY8GNXAeAn1xKsE0YDxPx/mXBYYtRoj8pC2cnbSFQUlOzBkyO90ivMSV22SRETFg==", + "resolved": "10.0.8", + "contentHash": "+f4C5g78QCGNyxzUfrTYsB7qYx06Zca0e88s3qFlea9/lQhgPImYdNprlgzl1uHhRU3fVHLfmbijayU2sJEZ6w==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8" } }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "iU/lPyrjHVA4jJ7Bl/VpXvgsAD4qJWc4oPSVJjMBeZjmv7IIo8wBKxnOUoXdZcSCUJ6MeBMs3WpXNfncO7OzRg==", + "resolved": "10.0.8", + "contentHash": "U+oquaPxFdY8lYeEIWO/AD7jDIl9sPW6aVWMQRHU/pZ/SWpLcOrAj2fcLe1HwXl4sYw1ONI56K/eELT3xr4RRQ==", "dependencies": { - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "t6T7umdzTKkSBOUMe5RYk826cTCsDU0hne9lPN5RGOSb3Kq0Xw8OEErM4zJ4dgZWV3G0ObK1Hf1IVU88uIKe6A==", + "resolved": "10.0.8", + "contentHash": "GkPvQe6IdidLu6Q3Lw6+B8NJpW8feW8czZ5mBKt5rXM/x8MvZfEp5WvAsjznzDGd23chIDrW0b2mmt+ScnEgiw==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6", - "Microsoft.Extensions.FileSystemGlobbing": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8", + "Microsoft.Extensions.FileSystemGlobbing": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "EG9GuYJlj1o1G8maSpKceZdj88OehKFRWaWp8BWUQWlvIJDWD8N0sIYDoRMGL/yX85H8KbVYPR9+dH/UjPEiKw==" + "resolved": "10.0.8", + "contentHash": "IUQet3SY51xIFcFZKtAB6a54/Zdxs7T3SQ84kJtOD6yeXfZgiOMksACWD5qtTmXGQGFH4QYGBOT0KIO8Uy/dJw==" }, "Microsoft.Extensions.Hosting.Abstractions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "x3C8tgsX+xWvV5u76LFm24/U7sSnCRjuudBkbFsMV/DIqCA85te7YGg6dpa7lBToDhi4Lry9E7Arpy0laUw5AQ==", + "resolved": "10.0.8", + "contentHash": "MoOWFPT88/pDfmWpbU9PydKRX/rJFQkliowE/L9wbQcl94IicUphb5BFgepkWiDkYYxPnuEqjN4buzOGW4vJpQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.6", - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6" + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.8", + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "ZjpnbMD88IcZQE2pE9lcGv3mkH2mlApPWNh88ya1wJpcxZLp7p4aN7twI2FpawGPAsXNpmMgtKaz3o796YWKWQ==", + "resolved": "10.0.8", + "contentHash": "K60JhWC2hN/Gi7TP68tBxSzk5ACWOs7lkmPzsfA8Bcf/IXTajujt2ORMf9rSMk1bsng6Lv4Y3fuxp3bm1+15ug==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6" + "Microsoft.Extensions.DependencyInjection": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "1YgBO3wAy0dlpQyVTKWBSPND/t0yZHsvd3shGpbeEwH8JSb2hnFI2pNFrOOUi/stsp+T/dqwqmRIGh47ibo9bw==", + "resolved": "10.0.8", + "contentHash": "fdVadZmsC8jRP0KvKy8mO8f6GV/HyBvElfcSxEhd+5FM5boAw/01iSaCto5G3G37ApJira4A3pNaVvBv8cUiLQ==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "YXyeFL/MFNuy7k4zCIxldXdyyK7hpW3wPnqyS5HxOJ+BkMkaT7cYVmpWYNnRaiEM6a98vjVjvIRHiUUsTJfc6g==", + "resolved": "10.0.8", + "contentHash": "rxSLTO7xTbcC3DuEJHNEijBr8g14Jj62zQ+DeFu68bsoTYoU8jLcMhc1735PV21bESXsATlL5LsfaWH71FOWAg==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Configuration.Binder": "10.0.6", - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6", - "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Configuration.Binder": "10.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8", + "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.8" } }, "Microsoft.Extensions.Logging.Console": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "i6yclZFcPCX3MWphzPEbnBXpgT9vjZQppS4mFFvzSVols9JvvZPVeMe1ufv1bWC0/NwrBY5C+xKX4Joq+8HCkg==", + "resolved": "10.0.8", + "contentHash": "6cv53sHsPnFS56PJw8X4GbNcjeX1KGyFJRxJWvxOgK63cnqeSB1k1eRwjUdkse0tBhwlH6qc9EOYDlan+CYTuw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging.Configuration": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging.Configuration": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8" } }, "Microsoft.Extensions.Logging.Debug": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "CS6sPOCtu4NZo7fy4+475DPyqP0Yty2lj14yGZBC6JRdLQKuy+698gcZpKlCEzfr/0mqnbuBlrLRr/LgI7u/4g==", + "resolved": "10.0.8", + "contentHash": "4HW3M1lGHHDwEYcDZHRNptBQ48LCI2yW+XV4vuxdfQUqafTpVT8j9RqAsez08krZKhIiaArWu8iQq5uRKZ9Ffg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8" } }, "Microsoft.Extensions.Logging.EventLog": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "E/EI8sRdfbdLfHsmtdVwvX2ygoyCvP0l8Bk95QS00nw7ZHuEIibalafSTNMGrIz34+Wriyivl6unQ56g634QPQ==", + "resolved": "10.0.8", + "contentHash": "kK/C3SLIoGrcZvddYQw4eMm6YaROiSYBO7YgUR5Hdv5l+GIjBmbvQK5cST2FqjeubiAOPqFEimBT2N/8wVI+3A==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6", - "System.Diagnostics.EventLog": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8", + "System.Diagnostics.EventLog": "10.0.8" } }, "Microsoft.Extensions.Logging.EventSource": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "On5ERRSmspe7/rCoiy+gaWmNI2hriIBTQS/2jtakeKE9MR7iDhOOjVjzjWapzZW3BlzAi4xCkocNqFl2AYQN3g==", + "resolved": "10.0.8", + "contentHash": "HX2M0MgzwQM8jpLe3AYAEMd0YsUfOP5RgGrDuk+Ki9n7HSuMbvLm9TEV3qRI3Pg9aqxc56GfgK/KdMRBhfWwKw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Logging": "10.0.6", - "Microsoft.Extensions.Logging.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Logging": "10.0.8", + "Microsoft.Extensions.Logging.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "v5RTWm+3Gdub21ADJeRG5bunOOxutFNBZk6qGH6Az4L5nyRZoLe3Kse7jfAyUcdEoiKp72XpNw/wGR+9wP+MtQ==", + "resolved": "10.0.8", + "contentHash": "VBD+131DpTNCNDfA4kIyKTiCySvJGNhwibdWBSdFRu7GMfXLXcXODkgA+KStKbbhzraLglZWUN4nXyHgW4JIRA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Options.ConfigurationExtensions": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "O7xt1vYMxku2+/WpFkh6X8RzUtYbKR+XCt0KOO0W9TbRbFeQdfb9Nry/CdVq57kOyOKS3Z4qD1xqV/8LpJQ0Xw==", + "resolved": "10.0.8", + "contentHash": "VOapXeO3lhBH0zYoyAH7tjapuo4V5pTHlevPpiSHueEquAajqd5nF0mttm+h/uE/exwAEuM5s26SzOJtletE3w==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Configuration.Binder": "10.0.6", - "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.6", - "Microsoft.Extensions.Options": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Configuration.Binder": "10.0.8", + "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.8", + "Microsoft.Extensions.Options": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "L8P21mqaG+CXvPheLndean/cHCOcItJqH8nx+0YQnK7wAiOR0G1IOC418ZSzTMD2D6Gmo0f2M5WR70XtpX2B8g==" + "resolved": "10.0.8", + "contentHash": "OBPo4nYhMyIbtueoC10CBm6AGAbo/A9IV8QQ/6ryZS7VvmqpGT7hunazeHLxFawRzn3oLOq4jhqhpBX4tfswWQ==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -296,46 +296,46 @@ }, "NuGet.Common": { "type": "Transitive", - "resolved": "7.3.0", - "contentHash": "y+7cQuzc6zePfo3GdueKgFAfE06pyNv1EGeordAMXotm6WEJw/m7UHv7GSLnib2HEPpzUk4Wvxgn9VgWkIe6Yw==", + "resolved": "7.6.0", + "contentHash": "uyXLqkbbZmkMvdHOR23l1EHW2hRmULtzoG3Ocj84VpGptnNfkODVboHGJfDfcn9Gi9oUNDs8/VjL4FZcST6zVg==", "dependencies": { - "NuGet.Frameworks": "7.3.0" + "NuGet.Frameworks": "7.6.0" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "7.3.0", - "contentHash": "9qNpnZP73pfGm1MYET78OCW/HNnKNZpTfWPB2z/EyxQnfWtJBANeFyogX8s7S+oWMbR+EG2w6jbDVKdvVJfCXA==", + "resolved": "7.6.0", + "contentHash": "+bNj+YneC5CNg1vR+WZjLAakscJlsi0KhADZUgIJPn4pwh8/jeCUMC5ik5cpET/i+QOplDy7aJVTGkpdfrlPww==", "dependencies": { - "NuGet.Common": "7.3.0", + "NuGet.Common": "7.6.0", "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "7.3.0", - "contentHash": "AnhSFUOrCrWp7pGtqhfOxa5HKm4rfpQxuatGDKzpGtTczasj6OcGVtB74PyqW7osdu9/BtkjnkAYvNk5iT82Gg==" + "resolved": "7.6.0", + "contentHash": "rJ7QtKN45XzLXCrMATve6eFLiUyUGEkA1rFSb6U6Fw6laM4hEAcKOrcdbgWlcFUlCK2158qP1LF00hg/ivF3nw==" }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "7.3.0", - "contentHash": "yvmJ8LUPUVMm2DAKSK3+QfJKoCxQR1NuyPYLHqFHb1zmUcGwq+IvSl/4JjUivJDztXnI9GSVlE/SjQLsRJPoYw==", + "resolved": "7.6.0", + "contentHash": "TDp+qHzRBy1zjwiJGCbfpdO0jMG5hH/bk7p1EABLKv9p5SIykDPGnbuYXm2iZO0QJ/H+hOI/vo5LfqM17Q+G0w==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "7.3.0", - "NuGet.Versioning": "7.3.0", + "NuGet.Configuration": "7.6.0", + "NuGet.Versioning": "7.6.0", "System.Security.Cryptography.Pkcs": "8.0.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "7.3.0", - "contentHash": "iOQPAdnVgj2U+K3AcdGGGcdS1tWyh3nvr64eqTDFCsDuHySBXSHRhl7eR8hdc0BZHxDjacRstbuaJKCurt2oPw==" + "resolved": "7.6.0", + "contentHash": "TpZxfOoQBQk/0r/2uc1A1qNYIKHkJGgOrWP+ax3nsNAUN/1BOQMDrgmGADogSA4hOXH1ZJiyeYg4Ca+vUW0sEg==" }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "RMe4gRBwSVd1O6HVRjNwLgcH2jjrT8sHyNRJegZLX68voA+HzMf1xZPvFxMMDpyW86B9U2pYslgl4DFCE61WyA==" + "resolved": "10.0.8", + "contentHash": "+Ro7WgIom+BDNH+YhTuZKL6QJ0ctfOpTyfUG/h3aU5KwXt3OaNf0wYWrTvoBUj+34Dy5V8dN9yCco1hAJQ4txw==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", @@ -361,8 +361,8 @@ "ICSharpCode.Decompiler": "[8.0.0-noversion, )", "K4os.Compression.LZ4": "[1.3.8, )", "Mono.Cecil": "[0.11.6, )", - "System.Composition.AttributedModel": "[10.0.6, )", - "System.Reflection.Metadata": "[10.0.6, )", + "System.Composition.AttributedModel": "[10.0.8, )", + "System.Reflection.Metadata": "[10.0.8, )", "System.Runtime.CompilerServices.Unsafe": "[6.1.2, )" } }, @@ -380,31 +380,31 @@ }, "Microsoft.Extensions.Configuration": { "type": "CentralTransitive", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "lYQ9S1FGXIWIU7243RimdAXQYsFDeLhSSZvbSDwbeI/kCzZ4MIYXpp3kMQ+bDJXwl9pzMRIYkd4f9zGqcYxfAQ==", + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "ehZcoPbjzWzS4XFvuz7R3V55SmpdkyMqFURLH3yXaN9NtXd9tR6CGB7pd49HYtCkenl+G7ctXSFLhNI08xLfRg==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Primitives": "10.0.6" + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Primitives": "10.0.8" } }, "Microsoft.Extensions.Configuration.Json": { "type": "CentralTransitive", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "o/IG5ywTfT5U1ANCAC4w1vKtXapdL/OlunywrWboySYJB79eX0+mw7qxqNRkq1WMZOJoSyjPjbyZ17l3LS7A6Q==", + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "KLtAZ6A38s1pIfCO2ns6aG14NNGMYNZ4PBYfFK4M+R4A+xuSc6oklhqDcpHZxvDpyBWeFtR5C8iQBw2ng8tUHQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "10.0.6", - "Microsoft.Extensions.Configuration.Abstractions": "10.0.6", - "Microsoft.Extensions.Configuration.FileExtensions": "10.0.6", - "Microsoft.Extensions.FileProviders.Abstractions": "10.0.6" + "Microsoft.Extensions.Configuration": "10.0.8", + "Microsoft.Extensions.Configuration.Abstractions": "10.0.8", + "Microsoft.Extensions.Configuration.FileExtensions": "10.0.8", + "Microsoft.Extensions.FileProviders.Abstractions": "10.0.8" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "CentralTransitive", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "w+dX4SIr1X9yegX2yX2dU1XtP4JAUVNdvOG/Evn+H+ndn96YzfIPX52FALXChrRNWFR9l77FQyg1mB7WQo6iOA==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "21nbDV60SRPWGIivsyl6lqBeEJNG1sginhhfWgRrr3Ais7aQ12To25OAHQxgoiJkjqy1aQ6RxpZBGYuTi7Ge6A==" }, "Mono.Cecil": { "type": "CentralTransitive", @@ -414,21 +414,21 @@ }, "System.Collections.Immutable": { "type": "CentralTransitive", - "requested": "[10.0.6, )", + "requested": "[10.0.8, )", "resolved": "9.0.0", "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" }, "System.Composition.AttributedModel": { "type": "CentralTransitive", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "sdv1Uk4auk8lc/0hsuAwE8Hpgg3tgbZDk4yRANIpfgk13f6Ssh+sKQviJchygk0ZR/fnFV4LtMyqzwZS8g7UaQ==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "qkcb2x773qUgOcrNk+AENDEtkYobPEM46jyYelB/Va3hWWeuSIFXHD7NdvP/L+H6OmexwV06T1OKr3ONl04kZw==" }, "System.Reflection.Metadata": { "type": "CentralTransitive", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "JQ3LKu6fdgnSqrgD5Uwfjvngi40lKjxWpUsaUnjQCgF4LWAjs+55ytZx11U+09FRByMS07LrFv89KXViUhlWTQ==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "Ap8JPUYLRnwQPk/rpyhxSoD+55/a7zJfZsmSD0maudVJT9p/xR+xegyT8gQIwh1XMC/lRowQJM06EdQ0dfiMkA==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "CentralTransitive", diff --git a/ICSharpCode.ILSpyX/packages.lock.json b/ICSharpCode.ILSpyX/packages.lock.json index 028f4e9970..92f2384cdc 100644 --- a/ICSharpCode.ILSpyX/packages.lock.json +++ b/ICSharpCode.ILSpyX/packages.lock.json @@ -16,13 +16,13 @@ }, "Microsoft.SourceLink.GitHub": { "type": "Direct", - "requested": "[10.0.202, )", - "resolved": "10.0.202", - "contentHash": "vRm3w0AWndnqt8X73qoWTdD/qp7o+bYMCufl7hSiQUSqeI3WKdqA/ElE6MCUscy84FX8HCMcK2EJCtTm+4bdbw==", + "requested": "[10.0.300, )", + "resolved": "10.0.300", + "contentHash": "QzCtLkXVb3l4IxcpvJCbzUwMLihAmLN6vVLjQGSzYSF8d2dvXxqJAZk83RV3gYnp2egz8jRMgSR2woY3vOahTA==", "dependencies": { - "Microsoft.Build.Tasks.Git": "10.0.202", - "Microsoft.SourceLink.Common": "10.0.202", - "System.IO.Hashing": "10.0.6" + "Microsoft.Build.Tasks.Git": "10.0.300", + "Microsoft.SourceLink.Common": "10.0.300", + "System.IO.Hashing": "10.0.8" } }, "Mono.Cecil": { @@ -33,15 +33,15 @@ }, "System.Composition.AttributedModel": { "type": "Direct", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "sdv1Uk4auk8lc/0hsuAwE8Hpgg3tgbZDk4yRANIpfgk13f6Ssh+sKQviJchygk0ZR/fnFV4LtMyqzwZS8g7UaQ==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "qkcb2x773qUgOcrNk+AENDEtkYobPEM46jyYelB/Va3hWWeuSIFXHD7NdvP/L+H6OmexwV06T1OKr3ONl04kZw==" }, "System.Reflection.Metadata": { "type": "Direct", - "requested": "[10.0.6, )", - "resolved": "10.0.6", - "contentHash": "JQ3LKu6fdgnSqrgD5Uwfjvngi40lKjxWpUsaUnjQCgF4LWAjs+55ytZx11U+09FRByMS07LrFv89KXViUhlWTQ==" + "requested": "[10.0.8, )", + "resolved": "10.0.8", + "contentHash": "Ap8JPUYLRnwQPk/rpyhxSoD+55/a7zJfZsmSD0maudVJT9p/xR+xegyT8gQIwh1XMC/lRowQJM06EdQ0dfiMkA==" }, "System.Runtime.CompilerServices.Unsafe": { "type": "Direct", @@ -51,27 +51,27 @@ }, "TomsToolbox.Composition.Analyzer": { "type": "Direct", - "requested": "[2.23.0, )", - "resolved": "2.23.0", - "contentHash": "WHvTkPV5AI9FQY7MB7PUWgIkm69NEiCmuG0A7cVXFF/wNQ0xI5YjS60a20vM1Z1Sg+mDDkZ4452hwFGaky0Txg==" + "requested": "[2.24.0, )", + "resolved": "2.24.0", + "contentHash": "dKHqW1MeAMnDIbtx8qDTsGwy/7LUiQ3ccdzHX0PzCh1r98Lgl/1deIky9+ojZO0K5HjeA7uE+eW9/h+v7EOIBA==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "10.0.202", - "contentHash": "HXAW7dToPLi6lHN4TJz1FfxLYfPS3EF20YrrZxQ9xbwbjLkFXJ+SwkuuILoAdCWTNHhHfa5oqOsrOEQX5s+eMg==", + "resolved": "10.0.300", + "contentHash": "P0kaQwVZx4xIUe2FtrLyBadYNXuAljttJUPvjBYRuHhPE8L77L42KakLDkaADRiUrGspoLcMwayjrbQhYTr0zA==", "dependencies": { - "System.IO.Hashing": "10.0.6" + "System.IO.Hashing": "10.0.8" } }, "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "10.0.202", - "contentHash": "g8E67huS0Slt6iJiUG1uj2N4NBo/q68Q1y1H4nFu1Cn4AOp6S5D8AeGLhGMzBT+JmNCjiGTvKco2qkbe4F31tQ==" + "resolved": "10.0.300", + "contentHash": "0jlkXaUGjYlWTIVPve5MftjKHnT3SlAtq9BCLV4J9IjdPrxV/+4rMlBSjfr1khG8/GC6KGojjola8E1VvWF0qQ==" }, "System.IO.Hashing": { "type": "Transitive", - "resolved": "10.0.6", - "contentHash": "lbMLkqFekDR4DeFd26eEfrG2HlvixIfs22uk/e2+9/NJ7WxMycVVakcQpuJvvqgc9XxwEgSd/Td+dZA+TjDDwA==" + "resolved": "10.0.8", + "contentHash": "+dJsbPJ3FyUbTZNplFj0RCKePFizmv6ewDV46JE9q/IVH4c3xTCftHfHelLsAKf0jryIPqgMb5GpS0x7TAY3mg==" }, "icsharpcode.decompiler": { "type": "Project", @@ -82,7 +82,7 @@ }, "System.Collections.Immutable": { "type": "CentralTransitive", - "requested": "[10.0.6, )", + "requested": "[10.0.8, )", "resolved": "9.0.0", "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" } diff --git a/ILSpy.Installer/ILSpy.Installer.csproj b/ILSpy.Installer/ILSpy.Installer.csproj index abe348a39f..8603eb6f18 100644 --- a/ILSpy.Installer/ILSpy.Installer.csproj +++ b/ILSpy.Installer/ILSpy.Installer.csproj @@ -23,7 +23,7 @@ - + diff --git a/ILSpy.Installer/setup.cs b/ILSpy.Installer/setup.cs index e8e9d3934e..a1cbe059b7 100644 --- a/ILSpy.Installer/setup.cs +++ b/ILSpy.Installer/setup.cs @@ -36,6 +36,9 @@ static public void Main() new Files(Path.Combine(buildOutputDir, "ILSpy.resources.dll")), new Files(Path.Combine(buildOutputDir, "ILSpy.ReadyToRun.Plugin.resources.dll")))); + // https://github.com/oleg-shilo/wixsharp/issues/1900 in addition to the pipeline dotnet tool install command + WixExtension.UI.PreferredVersion = "6.0.2"; + #if ARM64 project.Platform = Platform.arm64; #else