Skip to content

Merge master into openapi #1714

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 9 commits into from
Apr 20, 2025
Merged

Merge master into openapi #1714

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b48e569
Trim trailing whitespace from files
bkoelman Apr 6, 2025
b97fdd4
Restore trailing whitespace (broken build)
bkoelman Apr 6, 2025
636ee1d
Add Constellation to the universe model, we need a many-to-many relat…
bkoelman Apr 19, 2025
a84b258
Remove redundant Clear calls
bkoelman Apr 20, 2025
ac31043
Fix invalid expression for total count on inverse relationship filter…
bkoelman Apr 20, 2025
b0c0838
Merge pull request #1711 from json-api-dotnet/crashfix-total
bkoelman Apr 20, 2025
67386f3
Add workaround for bug at https://github.com/microsoft/kiota-dotnet/i…
bkoelman Apr 20, 2025
5a4e8cc
Merge branch 'master' into merge-master-into-openapi
bkoelman Apr 20, 2025
7883e69
Trim trailing whitespace from files in OpenAPI
bkoelman Apr 20, 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
Prev Previous commit
Next Next commit
Add workaround for bug at microsoft/kiota-dotnet#535 (#1713)
  • Loading branch information
@bkoelman
bkoelman authored Apr 20, 2025
commit 67386f3fa1fccd90bce4da5c0018c61015940d09
4 changes: 2 additions & 2 deletions src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,11 @@ public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConver
}
}

attributes.Add(attributeName, attributeValue);
attributes[attributeName] = attributeValue;
}
else
{
attributes.Add(attributeName, null);
attributes[attributeName] = null;
reader.Skip();
}

Expand Down
Loading