Skip to content

Don't use C# name in model dictionary #5376

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
merged 8 commits into from
Jul 29, 2025
Merged

Don't use C# name in model dictionary #5376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
22e44a2
Don't use C# name in model dictionary
sbomer Jul 25, 2025
45f084f
Same for visitedTypes
sbomer Jul 25, 2025
c0ec31d
Update generated code
sbomer Jul 28, 2025
455ce80
Update preview.yml
JoshLove-msft Jul 28, 2025
8af2215
Update preview.yml
JoshLove-msft Jul 28, 2025
6953f0c
Update preview.yml
JoshLove-msft Jul 29, 2025
093b7c8
Update eng/pipelines/preview.yml
JoshLove-msft Jul 29, 2025
107e622
Merge branch 'main' into fixMRWDups
live1206 Jul 29, 2025
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: 2 additions & 2 deletions src/AutoRest.CSharp/Common/Generation/Writers/ModelReaderWriterContextWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ private static bool IsObsolete(CSharpType type)
private IEnumerable<CSharpType> CollectBuildableTypes(IEnumerable<TypeProvider> models)
{
var buildableTypes = new HashSet<CSharpType>(new CSharpTypeNameComparer());
var visitedTypes = new HashSet<CSharpType>(new CSharpTypeNameComparer());
var visitedTypes = new HashSet<CSharpType>();

// for all Resource types, just add them directly to buildableTypes
foreach (var resource in models.OfType<Resource>())
{
buildableTypes.Add(resource.Type);
}

var modelDictionary = models.OfType<SerializableObjectType>().ToDictionary(m => m.Type, m => m, new CSharpTypeNameComparer());
var modelDictionary = models.OfType<SerializableObjectType>().ToDictionary(m => m.Type, m => m);

foreach (var model in modelDictionary.Values)
{
Expand Down
2 changes: 1 addition & 1 deletion test/TestProjects/Customizations-TypeSpec/src/Generated/Models/CustomizationsInTspContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CustomizationsInTsp
/// Context class which will be filled in by the System.ClientModel.SourceGeneration.
/// For more information see 'https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md'
/// </summary>
[ModelReaderWriterBuildable(typeof(ModelStruct?))]
[ModelReaderWriterBuildable(typeof(ModelStruct))]
[ModelReaderWriterBuildable(typeof(ModelToAddAdditionalSerializableProperty))]
[ModelReaderWriterBuildable(typeof(ModelToChangeNamespace))]
[ModelReaderWriterBuildable(typeof(ModelToMakeInternal))]
Expand Down