Skip to content

Remove declaring type from the member name in the baselines #38116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndriySvyryd merged 2 commits into from
Apr 16, 2026
Merged

Remove declaring type from the member name in the baselines #38116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ab2b2
Fix
AndriySvyryd Apr 15, 2026
adf1fa6
Remove declaring type from the member name in the baselines
AndriySvyryd Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion eng/Tools/ApiChief/Format/Formatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ internal static class Formatter
ConversionFlags.SupportRecordClasses |
ConversionFlags.UseFullyQualifiedEntityNames |
ConversionFlags.UseNullableSpecifierForValueTypes |
ConversionFlags.ShowDeclaringType |
ConversionFlags.UseFullyQualifiedTypeNames
};

Expand All @@ -40,6 +39,7 @@ internal static class Formatter
ConversionFlags.All
& ~(ConversionFlags.PlaceReturnTypeAfterParameterList
| ConversionFlags.ShowAccessibility
| ConversionFlags.ShowDeclaringType
| ConversionFlags.ShowTypeParameterVarianceModifier),
};

Expand All @@ -49,6 +49,7 @@ internal static class Formatter
ConversionFlags.All
& ~(ConversionFlags.PlaceReturnTypeAfterParameterList
| ConversionFlags.ShowAccessibility
| ConversionFlags.ShowDeclaringType
| ConversionFlags.ShowTypeParameterVarianceModifier),
};

Expand All @@ -58,6 +59,7 @@ internal static class Formatter
ConversionFlags.All
& ~(ConversionFlags.PlaceReturnTypeAfterParameterList
| ConversionFlags.ShowAccessibility
| ConversionFlags.ShowDeclaringType
| ConversionFlags.ShowReturnType
| ConversionFlags.ShowTypeParameterVarianceModifier),
};
Expand Down
6 changes: 3 additions & 3 deletions eng/Tools/ApiChief/Format/FormattingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ private static string SimplifyTypeExpression(string typeExpression)
private static string SimplifyMemberIdentifier(string memberIdentifier)
{
var segments = SplitQualifiedSegments(memberIdentifier);
return segments.Count <= 2
? string.Join('.', segments)
: string.Join('.', segments.GetRange(segments.Count - 2, 2));
return segments.Count == 0
? memberIdentifier
: segments[^1];
}

private static List<string> SplitQualifiedSegments(string value)
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</PropertyGroup>

<PropertyGroup Label="Tooling dependencies">
<ICSharpCodeDecompilerVersion>9.1.0.7988</ICSharpCodeDecompilerVersion>
<ICSharpCodeDecompilerVersion>10.0.0.8330</ICSharpCodeDecompilerVersion>
<SystemCommandLineVersion>2.0.5</SystemCommandLineVersion>
</PropertyGroup>

Expand Down
120 changes: 60 additions & 60 deletions src/EFCore.Abstractions/EFCore.Abstractions.baseline.json
View file
Open in desktop

Large diffs are not rendered by default.

778 changes: 389 additions & 389 deletions src/EFCore.Cosmos/EFCore.Cosmos.baseline.json
View file
Open in desktop

Large diffs are not rendered by default.

660 changes: 330 additions & 330 deletions src/EFCore.Design/EFCore.Design.baseline.json
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions src/EFCore.InMemory/EFCore.InMemory.baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,146 +5,146 @@
"Type": "class Microsoft.EntityFrameworkCore.Metadata.Conventions.DefiningQueryRewritingConvention : Microsoft.EntityFrameworkCore.Metadata.Conventions.QueryFilterRewritingConvention",
"Methods": [
{
"Member": "Microsoft.EntityFrameworkCore.Metadata.Conventions.DefiningQueryRewritingConvention.DefiningQueryRewritingConvention(Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure.ProviderConventionSetBuilderDependencies dependencies);"
"Member": "DefiningQueryRewritingConvention(Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure.ProviderConventionSetBuilderDependencies dependencies);"
},
{
"Member": "override void Microsoft.EntityFrameworkCore.Metadata.Conventions.DefiningQueryRewritingConvention.ProcessModelFinalizing(Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionModelBuilder modelBuilder, Microsoft.EntityFrameworkCore.Metadata.Conventions.IConventionContext<Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionModelBuilder> context);"
"Member": "override void ProcessModelFinalizing(Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionModelBuilder modelBuilder, Microsoft.EntityFrameworkCore.Metadata.Conventions.IConventionContext<Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionModelBuilder> context);"
}
]
},
{
"Type": "interface Microsoft.EntityFrameworkCore.Infrastructure.IInMemoryDbContextOptionsBuilderInfrastructure",
"Properties": [
{
"Member": "Microsoft.EntityFrameworkCore.DbContextOptionsBuilder Microsoft.EntityFrameworkCore.Infrastructure.IInMemoryDbContextOptionsBuilderInfrastructure.OptionsBuilder { get; }"
"Member": "Microsoft.EntityFrameworkCore.DbContextOptionsBuilder OptionsBuilder { get; }"
}
]
},
{
"Type": "class Microsoft.EntityFrameworkCore.Metadata.Conventions.InMemoryConventionSetBuilder : Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure.ProviderConventionSetBuilder",
"Methods": [
{
"Member": "Microsoft.EntityFrameworkCore.Metadata.Conventions.InMemoryConventionSetBuilder.InMemoryConventionSetBuilder(Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure.ProviderConventionSetBuilderDependencies dependencies);"
"Member": "InMemoryConventionSetBuilder(Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure.ProviderConventionSetBuilderDependencies dependencies);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Conventions.ConventionSet Microsoft.EntityFrameworkCore.Metadata.Conventions.InMemoryConventionSetBuilder.Build();"
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Conventions.ConventionSet Build();"
},
{
"Member": "override Microsoft.EntityFrameworkCore.Metadata.Conventions.ConventionSet Microsoft.EntityFrameworkCore.Metadata.Conventions.InMemoryConventionSetBuilder.CreateConventionSet();"
"Member": "override Microsoft.EntityFrameworkCore.Metadata.Conventions.ConventionSet CreateConventionSet();"
},
{
"Member": "static Microsoft.EntityFrameworkCore.ModelBuilder Microsoft.EntityFrameworkCore.Metadata.Conventions.InMemoryConventionSetBuilder.CreateModelBuilder();"
"Member": "static Microsoft.EntityFrameworkCore.ModelBuilder CreateModelBuilder();"
}
]
},
{
"Type": "static class Microsoft.EntityFrameworkCore.InMemoryDatabaseFacadeExtensions",
"Methods": [
{
"Member": "static bool Microsoft.EntityFrameworkCore.InMemoryDatabaseFacadeExtensions.IsInMemory(this Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade database);"
"Member": "static bool IsInMemory(this Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade database);"
}
]
},
{
"Type": "sealed class Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot",
"Methods": [
{
"Member": "Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot.InMemoryDatabaseRoot();"
"Member": "InMemoryDatabaseRoot();"
}
]
},
{
"Type": "class Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder : Microsoft.EntityFrameworkCore.Infrastructure.IInMemoryDbContextOptionsBuilderInfrastructure",
"Methods": [
{
"Member": "Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.InMemoryDbContextOptionsBuilder(Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder);"
"Member": "InMemoryDbContextOptionsBuilder(Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder);"
},
{
"Member": "virtual Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.EnableNullChecks(bool nullChecksEnabled = true);"
"Member": "virtual Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder EnableNullChecks(bool nullChecksEnabled = true);"
},
{
"Member": "override bool Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.Equals(object? obj);"
"Member": "override bool Equals(object? obj);"
},
{
"Member": "override int Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.GetHashCode();"
"Member": "override int GetHashCode();"
},
{
"Member": "override string? Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.ToString();"
"Member": "override string? ToString();"
}
],
"Properties": [
{
"Member": "virtual Microsoft.EntityFrameworkCore.DbContextOptionsBuilder Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder.OptionsBuilder { get; }"
"Member": "virtual Microsoft.EntityFrameworkCore.DbContextOptionsBuilder OptionsBuilder { get; }"
}
]
},
{
"Type": "static class Microsoft.EntityFrameworkCore.InMemoryDbContextOptionsExtensions",
"Methods": [
{
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> Microsoft.EntityFrameworkCore.InMemoryDbContextOptionsExtensions.UseInMemoryDatabase<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> optionsBuilder, string databaseName, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> UseInMemoryDatabase<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> optionsBuilder, string databaseName, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder Microsoft.EntityFrameworkCore.InMemoryDbContextOptionsExtensions.UseInMemoryDatabase(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder, string databaseName, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder UseInMemoryDatabase(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder, string databaseName, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> Microsoft.EntityFrameworkCore.InMemoryDbContextOptionsExtensions.UseInMemoryDatabase<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> optionsBuilder, string databaseName, Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot? databaseRoot, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> UseInMemoryDatabase<TContext>(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder<TContext> optionsBuilder, string databaseName, Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot? databaseRoot, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder Microsoft.EntityFrameworkCore.InMemoryDbContextOptionsExtensions.UseInMemoryDatabase(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder, string databaseName, Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot? databaseRoot, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
"Member": "static Microsoft.EntityFrameworkCore.DbContextOptionsBuilder UseInMemoryDatabase(this Microsoft.EntityFrameworkCore.DbContextOptionsBuilder optionsBuilder, string databaseName, Microsoft.EntityFrameworkCore.Storage.InMemoryDatabaseRoot? databaseRoot, System.Action<Microsoft.EntityFrameworkCore.Infrastructure.InMemoryDbContextOptionsBuilder>? inMemoryOptionsAction = null);"
}
]
},
{
"Type": "static class Microsoft.EntityFrameworkCore.InMemoryEntityTypeBuilderExtensions",
"Methods": [
{
"Member": "static bool Microsoft.EntityFrameworkCore.InMemoryEntityTypeBuilderExtensions.CanSetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query, bool fromDataAnnotation = false);"
"Member": "static bool CanSetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query, bool fromDataAnnotation = false);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder Microsoft.EntityFrameworkCore.InMemoryEntityTypeBuilderExtensions.ToInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query);"
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder ToInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<TEntity> Microsoft.EntityFrameworkCore.InMemoryEntityTypeBuilderExtensions.ToInMemoryQuery<TEntity>(this Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<TEntity> entityTypeBuilder, System.Linq.Expressions.Expression<System.Func<System.Linq.IQueryable<TEntity>>> query);"
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<TEntity> ToInMemoryQuery<TEntity>(this Microsoft.EntityFrameworkCore.Metadata.Builders.EntityTypeBuilder<TEntity> entityTypeBuilder, System.Linq.Expressions.Expression<System.Func<System.Linq.IQueryable<TEntity>>> query);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder? Microsoft.EntityFrameworkCore.InMemoryEntityTypeBuilderExtensions.ToInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query, bool fromDataAnnotation = false);"
"Member": "static Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder? ToInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.Builders.IConventionEntityTypeBuilder entityTypeBuilder, System.Linq.Expressions.LambdaExpression? query, bool fromDataAnnotation = false);"
}
]
},
{
"Type": "static class Microsoft.EntityFrameworkCore.InMemoryEntityTypeExtensions",
"Methods": [
{
"Member": "static System.Linq.Expressions.LambdaExpression? Microsoft.EntityFrameworkCore.InMemoryEntityTypeExtensions.GetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IReadOnlyEntityType entityType);"
"Member": "static System.Linq.Expressions.LambdaExpression? GetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IReadOnlyEntityType entityType);"
},
{
"Member": "static Microsoft.EntityFrameworkCore.Metadata.ConfigurationSource? Microsoft.EntityFrameworkCore.InMemoryEntityTypeExtensions.GetInMemoryQueryConfigurationSource(this Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType entityType);"
"Member": "static Microsoft.EntityFrameworkCore.Metadata.ConfigurationSource? GetInMemoryQueryConfigurationSource(this Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType entityType);"
},
{
"Member": "static void Microsoft.EntityFrameworkCore.InMemoryEntityTypeExtensions.SetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IMutableEntityType entityType, System.Linq.Expressions.LambdaExpression? inMemoryQuery);"
"Member": "static void SetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IMutableEntityType entityType, System.Linq.Expressions.LambdaExpression? inMemoryQuery);"
},
{
"Member": "static System.Linq.Expressions.LambdaExpression? Microsoft.EntityFrameworkCore.InMemoryEntityTypeExtensions.SetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType entityType, System.Linq.Expressions.LambdaExpression? inMemoryQuery, bool fromDataAnnotation = false);"
"Member": "static System.Linq.Expressions.LambdaExpression? SetInMemoryQuery(this Microsoft.EntityFrameworkCore.Metadata.IConventionEntityType entityType, System.Linq.Expressions.LambdaExpression? inMemoryQuery, bool fromDataAnnotation = false);"
}
]
},
{
"Type": "static class Microsoft.EntityFrameworkCore.Diagnostics.InMemoryEventId",
"Fields": [
{
"Member": "static readonly Microsoft.Extensions.Logging.EventId Microsoft.EntityFrameworkCore.Diagnostics.InMemoryEventId.ChangesSaved"
"Member": "static readonly Microsoft.Extensions.Logging.EventId ChangesSaved"
},
{
"Member": "static readonly Microsoft.Extensions.Logging.EventId Microsoft.EntityFrameworkCore.Diagnostics.InMemoryEventId.TransactionIgnoredWarning"
"Member": "static readonly Microsoft.Extensions.Logging.EventId TransactionIgnoredWarning"
}
]
},
{
"Type": "static class Microsoft.Extensions.DependencyInjection.InMemoryServiceCollectionExtensions",
"Methods": [
{
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection Microsoft.Extensions.DependencyInjection.InMemoryServiceCollectionExtensions.AddEntityFrameworkInMemoryDatabase(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection);"
"Member": "static Microsoft.Extensions.DependencyInjection.IServiceCollection AddEntityFrameworkInMemoryDatabase(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection);"
}
]
}
Expand Down
Loading
Loading