pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #3556 from icsharpcode/christophwille/dotnet10rc1 

Update to .NET 10 RC1
pull/3560/head
Siegfried Pammer 4 months ago committed by GitHub
parent
d1dc7b258a 7f84d24167
commit
cce3e3b12d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 283 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .github/workflows/build-ilspy.yml
  2. 2
      BuildTools/pre-commit
  3. 34
      Directory.Packages.props
  4. 16
      ICSharpCode.BamlDecompiler/packages.lock.json
  5. 6
      ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
  6. 61
      ICSharpCode.Decompiler/TypeSystem/ExtensionInfo.cs
  7. 9
      ICSharpCode.Decompiler/TypeSystem/Implementation/KnownAttributes.cs
  8. 344
      ICSharpCode.ILSpyCmd/packages.lock.json
  9. 26
      ICSharpCode.ILSpyX/packages.lock.json
  10. 6
      ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs

2
.github/workflows/build-ilspy.yml
Unescape View File

@ -45,7 +45,7 @@ jobs:
- name: Install dotnet-format - name: Install dotnet-format
env: env:
DOTNET_FORMAT_VERSION: 10.0.100-preview.7.25380.108 DOTNET_FORMAT_VERSION: 10.0.100-rc.1.25451.107
DOTNET_FORMAT_SOURCE: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json DOTNET_FORMAT_SOURCE: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json
run: dotnet tool install -g dotnet-format --version "${{env.DOTNET_FORMAT_VERSION}}" --add-source "${{env.DOTNET_FORMAT_SOURCE}}" run: dotnet tool install -g dotnet-format --version "${{env.DOTNET_FORMAT_VERSION}}" --add-source "${{env.DOTNET_FORMAT_SOURCE}}"

2
BuildTools/pre-commit
Unescape View File

@ -5,7 +5,7 @@
set -eu set -eu
DOTNET_FORMAT_VERSION=10.0.100-preview.7.25380.108 DOTNET_FORMAT_VERSION=10.0.100-rc.1.25451.107
DOTNET_FORMAT_SOURCE="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" DOTNET_FORMAT_SOURCE="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json"
DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION" DOTNET_PATH="$LOCALAPPDATA/ICSharpCode/ILSpy/dotnet-format-$DOTNET_FORMAT_VERSION"
if [ ! -d "$DOTNET_PATH" ]; then if [ ! -d "$DOTNET_PATH" ]; then

34
Directory.Packages.props
Unescape View File

@ -6,10 +6,10 @@
<ItemGroup> <ItemGroup>
<PackageVersion Include="AvalonEdit" Version="6.3.1.120" /> <PackageVersion Include="AvalonEdit" Version="6.3.1.120" />
<PackageVersion Include="CliWrap" Version="3.9.0" /> <PackageVersion Include="CliWrap" Version="3.9.0" />
<PackageVersion Include="DataGridExtensions" Version="2.6.0" /> <PackageVersion Include="DataGridExtensions" Version="2.7.0" />
<PackageVersion Include="DiffLib" Version="2025.0.0" /> <PackageVersion Include="DiffLib" Version="2025.0.0" />
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" /> <PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Iced" Version="1.21.0" /> <PackageVersion Include="Iced" Version="1.21.0" />
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" /> <PackageVersion Include="K4os.Compression.LZ4" Version="1.3.8" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" /> <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
@ -19,17 +19,17 @@
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" /> <PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" /> <PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" /> <PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.0" /> <PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.2" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" /> <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.2" /> <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.4" />
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.8.2" /> <PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.8.4" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" /> <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
<PackageVersion Include="Mono.Cecil" Version="0.11.6" /> <PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="NSubstitute" Version="5.3.0" /> <PackageVersion Include="NSubstitute" Version="5.3.0" />
@ -39,13 +39,13 @@
<PackageVersion Include="NuGet.Protocol" Version="6.14.0" /> <PackageVersion Include="NuGet.Protocol" Version="6.14.0" />
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" /> <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" /> <PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="System.Composition.AttributedModel" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="System.Composition.AttributedModel" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="System.Collections.Immutable" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="System.Memory" Version="4.6.3" /> <PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0-preview.7.25380.108" /> <PackageVersion Include="System.Resources.Extensions" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" /> <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.8" /> <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.2" /> <PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.2" />
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.2" /> <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.2" />
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.2" /> <PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.2" />
@ -56,6 +56,6 @@
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" /> <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<GlobalPackageReference Include="TomsToolbox.Composition.Analyzer" Version="2.22.1" /> <GlobalPackageReference Include="TomsToolbox.Composition.Analyzer" Version="2.22.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

16
ICSharpCode.BamlDecompiler/packages.lock.json
Unescape View File

@ -4,15 +4,15 @@
"net10.0": { "net10.0": {
"Microsoft.Sbom.Targets": { "Microsoft.Sbom.Targets": {
"type": "Direct", "type": "Direct",
"requested": "[4.1.0, )", "requested": "[4.1.2, )",
"resolved": "4.1.0", "resolved": "4.1.2",
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw==" "contentHash": "AmGCBhWtWu1d1PCit6WTdmpq48nPmmnJz9zZFBsxoCjYZjjZ0Gjm+wuAzHzVMF8VmTo/NeDGi2C73969QXiryw=="
}, },
"TomsToolbox.Composition.Analyzer": { "TomsToolbox.Composition.Analyzer": {
"type": "Direct", "type": "Direct",
"requested": "[2.22.1, )", "requested": "[2.22.2, )",
"resolved": "2.22.1", "resolved": "2.22.2",
"contentHash": "bKcte9zaz+xH1k6C1YIYpheQ9mPNRSmd0dHQIEIq31KxAKMTLfiAo80aROKDJMYJ7ZomlUjjSMo/QCIikMMWTg==" "contentHash": "7gYo8ZR2eq3XkrilvUpLbTypeZy6IlD5FB8jah0YPhMOmDGhya4jJ3kfDMTTRt5m258Ou78P69mHMkG6DKZXsg=="
}, },
"icsharpcode.decompiler": { "icsharpcode.decompiler": {
"type": "Project", "type": "Project",
@ -23,13 +23,13 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "9.0.0", "resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
}, },
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "9.0.0", "resolved": "9.0.0",
"contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==" "contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ=="
} }

6
ICSharpCode.Decompiler/CSharp/CSharpDecompiler.cs
Unescape View File

@ -1436,7 +1436,7 @@ namespace ICSharpCode.Decompiler.CSharp
} }
if (settings.RequiredMembers) if (settings.RequiredMembers)
{ {
RemoveAttribute(typeDecl, KnownAttribute.RequiredAttribute); RemoveAttribute(typeDecl, KnownAttribute.Required);
} }
if (typeDecl.ClassType == ClassType.Enum) if (typeDecl.ClassType == ClassType.Enum)
{ {
@ -2016,7 +2016,7 @@ namespace ICSharpCode.Decompiler.CSharp
typeSystemAstBuilder.UseSpecialConstants = !(field.DeclaringType.Equals(field.ReturnType) || isMathPIOrE); typeSystemAstBuilder.UseSpecialConstants = !(field.DeclaringType.Equals(field.ReturnType) || isMathPIOrE);
var fieldDecl = typeSystemAstBuilder.ConvertEntity(field); var fieldDecl = typeSystemAstBuilder.ConvertEntity(field);
SetNewModifier(fieldDecl); SetNewModifier(fieldDecl);
if (settings.RequiredMembers && RemoveAttribute(fieldDecl, KnownAttribute.RequiredAttribute)) if (settings.RequiredMembers && RemoveAttribute(fieldDecl, KnownAttribute.Required))
{ {
fieldDecl.Modifiers |= Modifiers.Required; fieldDecl.Modifiers |= Modifiers.Required;
} }
@ -2132,7 +2132,7 @@ namespace ICSharpCode.Decompiler.CSharp
propertyDecl.Modifiers &= ~(Modifiers.New | Modifiers.Virtual); propertyDecl.Modifiers &= ~(Modifiers.New | Modifiers.Virtual);
propertyDecl.Modifiers |= Modifiers.Override; propertyDecl.Modifiers |= Modifiers.Override;
} }
if (settings.RequiredMembers && RemoveAttribute(propertyDecl, KnownAttribute.RequiredAttribute)) if (settings.RequiredMembers && RemoveAttribute(propertyDecl, KnownAttribute.Required))
{ {
propertyDecl.Modifiers |= Modifiers.Required; propertyDecl.Modifiers |= Modifiers.Required;
} }

61
ICSharpCode.Decompiler/TypeSystem/ExtensionInfo.cs
Unescape View File

@ -18,6 +18,7 @@
#nullable enable #nullable enable
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection.Metadata; using System.Reflection.Metadata;
@ -37,11 +38,21 @@ namespace ICSharpCode.Decompiler.TypeSystem
var metadata = module.MetadataFile.Metadata; var metadata = module.MetadataFile.Metadata;
foreach (var extGroup in extensionContainer.NestedTypes) foreach (var extGroup in extensionContainer.NestedTypes)
{
if (TryEncodingV1(extGroup))
{
continue;
}
TryEncodingV2(extGroup);
}
bool TryEncodingV1(ITypeDefinition extGroup)
{ {
if (!(extGroup is { Kind: TypeKind.Class, IsSealed: true } if (!(extGroup is { Kind: TypeKind.Class, IsSealed: true }
&& extGroup.Name.StartsWith("<>E__", System.StringComparison.Ordinal))) && extGroup.Name.StartsWith("<>E__", System.StringComparison.Ordinal)))
{ {
continue; return false;
} }
TypeDefinition td = metadata.GetTypeDefinition((TypeDefinitionHandle)extGroup.MetadataToken); TypeDefinition td = metadata.GetTypeDefinition((TypeDefinitionHandle)extGroup.MetadataToken);
@ -69,8 +80,53 @@ namespace ICSharpCode.Decompiler.TypeSystem
} }
if (marker == null || hasMultipleMarkers) if (marker == null || hasMultipleMarkers)
continue; return false;
CollectImplementationMethods(extGroup, marker, extensionMethods);
return true;
}
bool TryEncodingV2(ITypeDefinition extGroup)
{
if (!(extGroup is { Kind: TypeKind.Class, IsSealed: true }
&& extGroup.Name.StartsWith("<G>$", StringComparison.Ordinal)))
{
return false;
}
var markerType = extGroup.NestedTypes.SingleOrDefault(t => t.Name.StartsWith("<M>$", StringComparison.Ordinal) && t.IsStatic);
var marker = markerType?.Methods.SingleOrDefault(m => m.Name == "<Extension>$" && m.IsStatic && m.Parameters.Count == 1);
if (markerType == null || marker == null)
return false;
TypeDefinition td = metadata.GetTypeDefinition((TypeDefinitionHandle)extGroup.MetadataToken);
List<IMethod> extensionMethods = [];
// For easier access to accessors we use SRM
foreach (var h in td.GetMethods())
{
var method = module.GetDefinition(h);
if (method.SymbolKind is SymbolKind.Constructor)
continue;
var attribute = method.GetAttribute(KnownAttribute.ExtensionMarker);
if (attribute == null)
continue;
if (attribute.FixedArguments[0].Value?.ToString() != markerType.Name)
continue;
extensionMethods.Add(method);
}
CollectImplementationMethods(extGroup, marker, extensionMethods);
return true;
}
void CollectImplementationMethods(ITypeDefinition extGroup, IMethod marker, List<IMethod> extensionMethods)
{
foreach (var extension in extensionMethods) foreach (var extension in extensionMethods)
{ {
int expectedTypeParameterCount = extension.TypeParameters.Count + extGroup.TypeParameterCount; int expectedTypeParameterCount = extension.TypeParameters.Count + extGroup.TypeParameterCount;
@ -119,7 +175,6 @@ namespace ICSharpCode.Decompiler.TypeSystem
} }
} }
} }
} }
public ExtensionMemberInfo? InfoOfExtensionMember(IMethod method) public ExtensionMemberInfo? InfoOfExtensionMember(IMethod method)

9
ICSharpCode.Decompiler/TypeSystem/Implementation/KnownAttributes.cs
Unescape View File

@ -112,15 +112,18 @@ namespace ICSharpCode.Decompiler.TypeSystem
PreserveBaseOverrides, PreserveBaseOverrides,
// C# 11 attributes: // C# 11 attributes:
RequiredAttribute, Required,
// C# 12 attributes: // C# 12 attributes:
InlineArray, InlineArray,
// C# 14 attributes:
ExtensionMarker,
} }
public static class KnownAttributes public static class KnownAttributes
{ {
internal const int Count = (int)KnownAttribute.InlineArray + 1; internal const int Count = (int)KnownAttribute.ExtensionMarker + 1;
static readonly TopLevelTypeName[] typeNames = new TopLevelTypeName[Count]{ static readonly TopLevelTypeName[] typeNames = new TopLevelTypeName[Count]{
default, default,
@ -193,6 +196,8 @@ namespace ICSharpCode.Decompiler.TypeSystem
new TopLevelTypeName("System.Runtime.CompilerServices", "RequiredMemberAttribute"), new TopLevelTypeName("System.Runtime.CompilerServices", "RequiredMemberAttribute"),
// C# 12 attributes: // C# 12 attributes:
new TopLevelTypeName("System.Runtime.CompilerServices", "InlineArrayAttribute"), new TopLevelTypeName("System.Runtime.CompilerServices", "InlineArrayAttribute"),
// C# 14 attributes:
new TopLevelTypeName("System.Runtime.CompilerServices", "ExtensionMarkerAttribute"),
}; };
public static ref readonly TopLevelTypeName GetTypeName(this KnownAttribute attr) public static ref readonly TopLevelTypeName GetTypeName(this KnownAttribute attr)

344
ICSharpCode.ILSpyCmd/packages.lock.json
Unescape View File

@ -15,32 +15,32 @@
}, },
"Microsoft.Extensions.Hosting": { "Microsoft.Extensions.Hosting": {
"type": "Direct", "type": "Direct",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "VcqnTGY8bMnFxZQb3cjcXnXy4x7dJgp85UlujErNh34xh4ZislQ2XhX7ak0gUnRh8c9ZTI3xj4groyqBl/DNHA==", "contentHash": "MSxUXg8ZrySaprKTWT/nPXHo1JW9TcLuTb0E3DtQ0DRK8KJKkYJhvvbLWKHUZ/vyvMcL4Msp0jbnZQ4ywTdWdQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Binder": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Binder": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.CommandLine": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.CommandLine": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.EnvironmentVariables": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.FileExtensions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Json": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Json": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.UserSecrets": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.UserSecrets": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.DependencyInjection": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Diagnostics": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Diagnostics": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Physical": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Physical": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Hosting.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Hosting.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Console": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Console": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Debug": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Debug": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.EventLog": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.EventLog": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.EventSource": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.EventSource": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
@ -54,240 +54,240 @@
}, },
"System.Security.Cryptography.Pkcs": { "System.Security.Cryptography.Pkcs": {
"type": "Direct", "type": "Direct",
"requested": "[9.0.8, )", "requested": "[9.0.9, )",
"resolved": "9.0.8", "resolved": "9.0.9",
"contentHash": "+mtc8dZnrP9N1HZICncBzLUrX4YBP+WvAWb817auAA5mKOJzHZShuGpCtQiekgV/7N0uS/x0LkdBAezBcSBwVA==" "contentHash": "Y7/wY5lqrzJOu53yLFLPGaeKBcdWNw193udOFRB2joFDVpXLkmfPpfgks7dEIJYPIrW4k3onwR+4nQz6vIaaqA=="
}, },
"TomsToolbox.Composition.Analyzer": { "TomsToolbox.Composition.Analyzer": {
"type": "Direct", "type": "Direct",
"requested": "[2.22.1, )", "requested": "[2.22.2, )",
"resolved": "2.22.1", "resolved": "2.22.2",
"contentHash": "bKcte9zaz+xH1k6C1YIYpheQ9mPNRSmd0dHQIEIq31KxAKMTLfiAo80aROKDJMYJ7ZomlUjjSMo/QCIikMMWTg==" "contentHash": "7gYo8ZR2eq3XkrilvUpLbTypeZy6IlD5FB8jah0YPhMOmDGhya4jJ3kfDMTTRt5m258Ou78P69mHMkG6DKZXsg=="
}, },
"Microsoft.Extensions.Configuration.Abstractions": { "Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "Tos2R09p02UbSg97w7QNr+dNTKuBtmsWKy4+awTnn2d34CXDpsKkAdDis6gLmhuCjz4c0HyB5S0l2ahaqu+u7A==", "contentHash": "NOCQeNLsBMq0rdmZAWMWMEepO+/4iV6zBO2iyOBAzwtR1kZCVjrm/p4Z2Vda7IycOLEJKkcXfjN+oeqXH8mcFw==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "BAcZtIevY+MgiTX9t9iuz8CoYmGPoL1QeAlhNav8EVJmNlhKR/H7nESjxJifejcCRuwQ+dcXlFtHo1xrCMaZWA==", "contentHash": "leKQmXsApCae6Mp65B29INCh3IFEALvpvKNAmcNV1GcwgAxZaDFVS6WbOQegkYLvTAX2G3DT5KE0skI8jy1kig==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.CommandLine": { "Microsoft.Extensions.Configuration.CommandLine": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "wrRFfwx7avg204vRHD1C7//zo9axtSLqNydbPXVN6r1tpQUsTz2Mbd6QsYMo+zoNUSvFD7fPFZPsG8pkmbX50A==", "contentHash": "oIrzvbO70HUqC4rkzoc44Qt/sRr+RGECOHH1ju5iNDVfLLZS/GVNyKf9dqcrLhuqotmasIsqyjWktzVkJdYbWQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.EnvironmentVariables": { "Microsoft.Extensions.Configuration.EnvironmentVariables": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "bIh84M0Clp94aGE827+cw3Ld3E+LN68Goqk1oyHTAkOMftp3YbkGB/yEHGdydsNEi3kfiLw5lZdu3Nh1Agt9gg==", "contentHash": "uWgOErLi+EWXVFPFklgJ3NO4wgG6K5XxahCP248jktCOR4pgDymW8bLIIPZAyQXEX7tJ0qUoh/+SXudml56ecw==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.FileExtensions": { "Microsoft.Extensions.Configuration.FileExtensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "eGgKM6UgrXTTGNDkPsXE4gofRMK+LPv2PIzMRUOVFLB2iAjoVhSgTTDBiQgVSXZW279FCaoILD8wC7zz5+sZBA==", "contentHash": "gZO0j5JQjHy+CoBO7XRz4m5DhB16FOJsZIMj328xA/xSHhU6qK0xC2iboeC11W4MDKTukfnaj+yCtAtfHTcHkA==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Physical": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Physical": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.UserSecrets": { "Microsoft.Extensions.Configuration.UserSecrets": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "X6M5ARSre9pHhQcrdIoPGCrGe2Xh6iM4AYwJGXRrgG6+blFTc04Iau7tvnjOhCDaEFr2g2cxMJI1wiLlJFOECg==", "contentHash": "wHLjtFft+I8raeZ+ZEVMlWNlh67IIfbNKd+mdQ5D38crV9b7m3QgK3DwK2YAgYOGLgP44qrYweuoi6zSvUEklw==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Json": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Json": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Physical": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.FileProviders.Physical": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.DependencyInjection": { "Microsoft.Extensions.DependencyInjection": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "UVMEx1ZOOugXCNxXARPsmtu7B3RzYShFoeGvmO4wA1OmcW8cOSXr7QNTiCTp3uXNrx14daefmDX/BlsExlZyVg==", "contentHash": "LyE1mwZNT30J/6ygkZZm6QlDRaKpwQf5dHkREGAlJQr75kz1VGx0RI/cxa6kevnuYaLNE5UtgtGT2Amp+dFT1Q==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Diagnostics": { "Microsoft.Extensions.Diagnostics": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "hbUpAah1f1gSx7NT7GKnmnzdQiP6POB7Mo8HNGZQ5qdcsZm6c3e6toK92u4kMkgJ9Cp0mRgL2wIyDfT6ixS/qw==", "contentHash": "tuZIsk+xd+/jdBOhfjtJMnjnl6qNitUrx6WO7qUUCyJ5vMZiEaDW0XXdVWtvefUs08inp6fdYoL0+PBlHCtrAQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Diagnostics.Abstractions": { "Microsoft.Extensions.Diagnostics.Abstractions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "4KCRTDM1TUA1+zwUBefsM9vjCRzAjkhLOsITu5X/z8GxdwxvhVRQL3svELII4AwcWG2PUvAqWHIGnjmKlYJmIQ==", "contentHash": "rskaFEs+RNVX8AXFeC3QqjS9O5cMjYsyHLGt/3SV5IYXIJdIA+iy3W8/fVsJED0ydkssEkftewhiTCOqh1DM3w==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.FileProviders.Abstractions": { "Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "lvXcu7o7ETZ0SRPTOMhMuzyABFSiTwQdye1ATqdQH4u0n46s0QtTMN8u8zrHdIDtU5zv8hv3PqnOmmQt6lMzEQ==", "contentHash": "/Fi7B/NuEG5XMc80bHXb33ZO8SykBMcwOhZFygmNQ0SvmOUFD41M4XEtF27kmII73p1C4U84LWidkMZyvELmBw==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.FileProviders.Physical": { "Microsoft.Extensions.FileProviders.Physical": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "CCWJM/f0hEldsKdB+QXJpcyELI0VRHbIuWWejCk9pNQBTuPOJHX5Lxsn4Lt8d30DGosTfkAQWLpy/wh+TGT6xA==", "contentHash": "EdAkxAb8BQO6GI6NijKj7SYj79j7OOQlRCVJfyjw+6YvVBepery5gAUieu05ig4o4CYlpvie4xzmYoHiCN/6dQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileSystemGlobbing": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileSystemGlobbing": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.FileSystemGlobbing": { "Microsoft.Extensions.FileSystemGlobbing": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "HsDTy1yAhOyznpgtbaUpiHojeMDrmkwAI/iW6G9PksLfhJAFXT1PffKoWMG2+fS4rWo6yoaro2cmJH0RYBKJ0Q==" "contentHash": "EgPqaVLU+duTIlONHfipkTt0xtNZlHgta54QUj5nrXb7pY4rPMwgYExwxbjM9xGJ3lIMjp5H/zkKii55aZk9Sg=="
}, },
"Microsoft.Extensions.Hosting.Abstractions": { "Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "J6zRebs9tVxWat6q3Z8v1fknqYhUbyUVoZYiGqhu7g+ChVYeCdp/YL2qSvC/Ap/KThXu6+C+R40gdDPCjUq5EQ==", "contentHash": "lfe8ZALjb5z95IUadn/NBPdqvPG1XX7UbBuRbtPu9al6RwrbQnVq5Sq+tQ7PTPxNh5WABtcnFbNnuc9MpAWypQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging": { "Microsoft.Extensions.Logging": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "vktcXpKfaF3TEC5OoAv2ySdImeBErcbFwUduuFIGvKOdYGw1B1N8ZpG5GLxApMXFgygdMcAFrkotDWzOF1npUA==", "contentHash": "XKPlZZoN7eZjtpaincJm60Il2k5tBxuOfeT3w6gXcTNL5dM1tOR80hzDQaBIikyxI3uBApKtTU1Vge7In3W8Kg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.Abstractions": { "Microsoft.Extensions.Logging.Abstractions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "qfx62EG7wvjym/GusNX+kzqPByIVYiXyqBYaObQlIch5YukiVd4ovUJHALYt11jpcxpv9nmjgmqahIluf2j5xA==", "contentHash": "RwlHkxMbkgvKs5m0jfguF+a6nZH1qaJVC63cSAODNLMVyX22VumSWwDBgnzFTB3oUHfOnQgLmtEK1U/eEQRLLQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.Configuration": { "Microsoft.Extensions.Logging.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "nfivpgjltKnYWCT62WtNgaRyyTv92nRYkqJabEQIvmtlQrjuYNb/kiECy74+jd4t4AQPx3hlPn9hWiLGvIEHhg==", "contentHash": "Pv+5gS1QQJ3/RgfoQR9qFXbExFerQfcsWWYSkZSBmq0X6FmaM/HYHeb9epAfpWYagbBCM6QwSqltMG8uJZLMdg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Binder": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Binder": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.Console": { "Microsoft.Extensions.Logging.Console": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "VfOeXETfctJamiTwovg1SmyfEboi8klawzpE6hv45f8KPajn/PPTuYRCQjaQWiP0praYdAJWrV4TjvDF0+xxeg==", "contentHash": "0o2U5BuYJFt6c2XwOpfSEb5knaSgKwpYi1Jm7+CU1IlTFvyA5ddjLBmUm/dJmzWiWnoFvUJvsvPvLQYWCxGiDg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.Debug": { "Microsoft.Extensions.Logging.Debug": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "R1XFfHifpXKXtIGDt/QrvwnqPEOMEMdDppBMVjb5UpI3RSBKriTWdKeaJIcc1gx6e56aVO2xOT3EtfnK6Xb3Ig==", "contentHash": "HMpGwPNYt7M5XVSFkc8Y76CzLXvrM7AnyFgyDGfynhYvmX4MH2eT3w7c6eOb390WQcsNGkTGgZnb6QlaEwm9QA==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.EventLog": { "Microsoft.Extensions.Logging.EventLog": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "pa6ggb9nqfU+DPLI2NXRaUDmkrw3mvmXcnh4NQrgcvzNQPB1PW8HySNm+KvzX/nK/UmPtJEa3NbOhmpDBdrbMA==", "contentHash": "s2k2ihzSGm2lCGvc4Az3zJoijNPZ9xrT6U+ORj9T4rocLCSxe/21MKqxcjInJvVZgTn7HWpJomFw5qcJz+HXYg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107",
"System.Diagnostics.EventLog": "10.0.0-preview.7.25380.108" "System.Diagnostics.EventLog": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Logging.EventSource": { "Microsoft.Extensions.Logging.EventSource": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "K0Qydvu3fnotw1kynMz6kDt8FX+VnKxOjX1lVFjKKkyHroHitpz8YUOuA+TlbXQFZQyv3bO7nDimKVkcvPFcVQ==", "contentHash": "kQtRLj0UHV44+CVxPXwIhK2emuxjym1zqH3pAbtONYU6B8QuvFjThW0vU+SElEIfFGM8L11F84CIOJQeLGVvGQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Logging.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Options": { "Microsoft.Extensions.Options": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "kG3XdCpBiMSxPsAeMCy8YhHpe3sUlSoBGuZQfTcC/VaWKrvpQ5OrbhBCfb/SOPLzWexijSsDwtgjYenRvqE91Q==", "contentHash": "lM7V/A39nKSh7kdTqqh8yRCEvgw1P3X0odWd5o7A94j/Ln8xT+1kV60MTP/i78jaa4FNDhFfYE7yao5T84aQZg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Options.ConfigurationExtensions": { "Microsoft.Extensions.Options.ConfigurationExtensions": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "z05jUKh7+6FTFE+Obdg6wEQqvdxNf+ty5YUZ9VjNyzYcoN9hZMbX7RucTifl4CZCJXadlv79C7ZCSmHIK4x0pw==", "contentHash": "6G5VB30lHscf+GUb/e0ZNdN8/yeLzNHWDPfdk1zDVODIlDL3Lm0zcr/h0v9gatilVlKKzLno49ftwLqyhw0sbw==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Binder": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Binder": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Options": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Options": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Primitives": { "Microsoft.Extensions.Primitives": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "0oC37fX0irgi29vN8JQdvXn1jZI6upCIs8Q8J+loetDrWrB3fwYBqbUdz/mMS41G+kkjCSaGRfZM8dBiZqqMpw==" "contentHash": "BNCfqG7CvhUQp7Sj8Qcr+HVNXkwV/nQfD6uS1HXXY2oO//QNpi4Mqy6IGeaIPIZIoQxykhLgPoSOJqRPCJRh/Q=="
}, },
"Newtonsoft.Json": { "Newtonsoft.Json": {
"type": "Transitive", "type": "Transitive",
@ -340,8 +340,8 @@
}, },
"System.Diagnostics.EventLog": { "System.Diagnostics.EventLog": {
"type": "Transitive", "type": "Transitive",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "kKFLata6tLJ/1+jJTbsE9YZu/zeOGO+9ZeukQ3uni5flEjcPpjqGxtmqOx/IFUecMQjNGheNEVyC1KaMl+aZMg==" "contentHash": "rwQ/QDgOb3qLSOs8UbLBFigL8ewMCETOmrQwVbksRXLt3c/kizzljOdBf+KdXKCS3XmrKqMeOLOkZZM8WQDcTw=="
}, },
"System.Security.Cryptography.ProtectedData": { "System.Security.Cryptography.ProtectedData": {
"type": "Transitive", "type": "Transitive",
@ -361,8 +361,8 @@
"ICSharpCode.Decompiler": "[8.0.0-noversion, )", "ICSharpCode.Decompiler": "[8.0.0-noversion, )",
"K4os.Compression.LZ4": "[1.3.8, )", "K4os.Compression.LZ4": "[1.3.8, )",
"Mono.Cecil": "[0.11.6, )", "Mono.Cecil": "[0.11.6, )",
"System.Composition.AttributedModel": "[10.0.0-preview.7.25380.108, )", "System.Composition.AttributedModel": "[10.0.0-rc.1.25451.107, )",
"System.Reflection.Metadata": "[10.0.0-preview.7.25380.108, )", "System.Reflection.Metadata": "[10.0.0-rc.1.25451.107, )",
"System.Runtime.CompilerServices.Unsafe": "[6.1.2, )" "System.Runtime.CompilerServices.Unsafe": "[6.1.2, )"
} }
}, },
@ -383,31 +383,31 @@
}, },
"Microsoft.Extensions.Configuration": { "Microsoft.Extensions.Configuration": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "bqeb/og5BMVpJ0cAfVgHhyNPfQa/uF/t6MhoQ9Z0kAUuOvk+hCfnSKlx2CZUzrkrWN6zK/jRXZW8RsbIxtzexw==", "contentHash": "pyIiy0uo0i2pM1IPTHf9X/sy1lOxRjAPuj7TAHlt+prfEvurKOXVdTrK41Xmr4e6mScWdesoOVpIoAhgP/N5BQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Primitives": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.Primitives": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.Configuration.Json": { "Microsoft.Extensions.Configuration.Json": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "vMUtXxczM+wt2rZT3AtDHRG4m0Wzn4R+cTFSr4RDq3VPy1z+qeX+xa+a9Ft73R5ODy/T0N5F1fXxYN6h1fvh6w==", "contentHash": "vvKbTkuv/v4D/DQ65nKz4V55eN/JL23Mvm31GNvxvY9rpOsy4MtOu68+WE/fX62r0MVByGYULd1GLmQPAgJ3wQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.Abstractions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.Configuration.FileExtensions": "10.0.0-preview.7.25380.108", "Microsoft.Extensions.Configuration.FileExtensions": "10.0.0-rc.1.25451.107",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-preview.7.25380.108" "Microsoft.Extensions.FileProviders.Abstractions": "10.0.0-rc.1.25451.107"
} }
}, },
"Microsoft.Extensions.DependencyInjection.Abstractions": { "Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "0oSQ8o2O8eMxaInqR1GykEzzlerBTN3xQMsEtaWA4zbf1LmrqV7H9ctTTjK4oMeWMCTb9mfYoN9fsVWbAhkTXA==" "contentHash": "Wm2HfC0GlWExQmJajq85FHM9iHEOm61Z1c2YLivbzI6R5eT+TTSyfk3RHUra4oBU+oj1XhOIQ5hLW6Kg2r85tg=="
}, },
"Mono.Cecil": { "Mono.Cecil": {
"type": "CentralTransitive", "type": "CentralTransitive",
@ -417,21 +417,21 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "9.0.0", "resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
}, },
"System.Composition.AttributedModel": { "System.Composition.AttributedModel": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "BgKfmK5BAjJPj3DvCh7Qv2v/91FQfY2HwYchSurW1JajkVNhpSCCciZgk5tNOr815yUUpcAG8gY/CUUdYYdXcw==" "contentHash": "0zroRtuBzQdbwuCRklmRY9NXin4DYNVcZOkZ8zqgZFuKNb66GrxeWw3kfnymfyZ0Ib9J8J3kXlYfxKRXIzb+2g=="
}, },
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "8oQpCMmBOI24XT+xwG1dec/gOv+1uUqAasXYu2vq0NWpXsg/TYw563jD9wMSbQ/lIjnKJmPRvjLFyG8xaX9uww==" "contentHash": "ixP5rSQVGhwbYomPUL7XDRQpoh6YVXXomjfJGn0WasADk+ykq9C4pPN3as8F2KktDQ434vGz55NWU+vfZSt2EQ=="
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "CentralTransitive", "type": "CentralTransitive",

26
ICSharpCode.ILSpyX/packages.lock.json
Unescape View File

@ -10,9 +10,9 @@
}, },
"Microsoft.Sbom.Targets": { "Microsoft.Sbom.Targets": {
"type": "Direct", "type": "Direct",
"requested": "[4.1.0, )", "requested": "[4.1.2, )",
"resolved": "4.1.0", "resolved": "4.1.2",
"contentHash": "GidfeSVHFtNwZSbD2wmwWiUiGkVdND8QR1z21WpFa+/47Mi3YiDkAzsWF02wXrMx2Xd8j3QSfKOUY1JtnF+7uw==" "contentHash": "AmGCBhWtWu1d1PCit6WTdmpq48nPmmnJz9zZFBsxoCjYZjjZ0Gjm+wuAzHzVMF8VmTo/NeDGi2C73969QXiryw=="
}, },
"Microsoft.SourceLink.GitHub": { "Microsoft.SourceLink.GitHub": {
"type": "Direct", "type": "Direct",
@ -32,15 +32,15 @@
}, },
"System.Composition.AttributedModel": { "System.Composition.AttributedModel": {
"type": "Direct", "type": "Direct",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "BgKfmK5BAjJPj3DvCh7Qv2v/91FQfY2HwYchSurW1JajkVNhpSCCciZgk5tNOr815yUUpcAG8gY/CUUdYYdXcw==" "contentHash": "0zroRtuBzQdbwuCRklmRY9NXin4DYNVcZOkZ8zqgZFuKNb66GrxeWw3kfnymfyZ0Ib9J8J3kXlYfxKRXIzb+2g=="
}, },
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "Direct", "type": "Direct",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-preview.7.25380.108", "resolved": "10.0.0-rc.1.25451.107",
"contentHash": "8oQpCMmBOI24XT+xwG1dec/gOv+1uUqAasXYu2vq0NWpXsg/TYw563jD9wMSbQ/lIjnKJmPRvjLFyG8xaX9uww==" "contentHash": "ixP5rSQVGhwbYomPUL7XDRQpoh6YVXXomjfJGn0WasADk+ykq9C4pPN3as8F2KktDQ434vGz55NWU+vfZSt2EQ=="
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Direct", "type": "Direct",
@ -50,9 +50,9 @@
}, },
"TomsToolbox.Composition.Analyzer": { "TomsToolbox.Composition.Analyzer": {
"type": "Direct", "type": "Direct",
"requested": "[2.22.1, )", "requested": "[2.22.2, )",
"resolved": "2.22.1", "resolved": "2.22.2",
"contentHash": "bKcte9zaz+xH1k6C1YIYpheQ9mPNRSmd0dHQIEIq31KxAKMTLfiAo80aROKDJMYJ7ZomlUjjSMo/QCIikMMWTg==" "contentHash": "7gYo8ZR2eq3XkrilvUpLbTypeZy6IlD5FB8jah0YPhMOmDGhya4jJ3kfDMTTRt5m258Ou78P69mHMkG6DKZXsg=="
}, },
"Microsoft.Build.Tasks.Git": { "Microsoft.Build.Tasks.Git": {
"type": "Transitive", "type": "Transitive",
@ -73,7 +73,7 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "CentralTransitive", "type": "CentralTransitive",
"requested": "[10.0.0-preview.7.25380.108, )", "requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "9.0.0", "resolved": "9.0.0",
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==" "contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
} }

6
ILSpy/Metadata/CorTables/TypeDefTableTreeNode.cs
Unescape View File

@ -125,10 +125,10 @@ namespace ICSharpCode.ILSpy.Metadata
string fieldListTooltip; string fieldListTooltip;
public string FieldListTooltip { public string FieldListTooltip {
get { get {
var field = typeDef.GetFields().FirstOrDefault(); var @field = typeDef.GetFields().FirstOrDefault();
if (field.IsNil) if (@field.IsNil)
return null; return null;
return GenerateTooltip(ref fieldListTooltip, metadataFile, field); return GenerateTooltip(ref fieldListTooltip, metadataFile, @field);
} }
} }

Write Preview
Loading…
Cancel
Save