Skip to content
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

Jump to bottom

tests, PR feedback #14

Merged
merged 2 commits into from
Jun 21, 2022
Merged

tests, PR feedback #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d846ffb
PR feedback and extra tests
krwq Jun 21, 2022
0ec6ea0
Shorten class name, remove incorrect check (not true for polimorphic …
krwq Jun 21, 2022
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
3 changes: 3 additions & 0 deletions src/libraries/System.Text.Json/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,4 +659,7 @@
<data name="CombineOneOfResolversIsNull" xml:space="preserve">
<value>One of the provided resolvers is null.</value>
</data>
<data name="JsonPropertyInfoBoundToDifferentParent" xml:space="preserve">
<value>JsonPropertyInfo with name '{0}' for type '{1}' is already bound to different JsonTypeInfo.</value>
</data>
</root>
4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/src/System.Text.Json.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ The System.Text.Json library is built-in as part of the shared framework in .NET
<Compile Include="System\Text\Json\JsonHelpers.cs" />
<Compile Include="System\Text\Json\JsonHelpers.Date.cs" />
<Compile Include="System\Text\Json\JsonHelpers.Escaping.cs" />
<Compile Include="System\Text\Json\JsonPropertyDictionary.ValueList.cs" />
<Compile Include="System\Text\Json\JsonPropertyDictionaryJsonPropertyValueList.cs" />
<Compile Include="System\Text\Json\JsonPropertyDictionary.cs" />
<Compile Include="System\Text\Json\JsonPropertyDictionary.KeyCollection.cs" />
<Compile Include="System\Text\Json\JsonPropertyDictionary.ValueCollection.cs" />
Expand Down Expand Up @@ -319,7 +319,7 @@ The System.Text.Json library is built-in as part of the shared framework in .NET
<Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.UnsignedNumber.cs" />
<Compile Include="System\ReflectionExtensions.cs" />
<Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" />
<None Include="README.md" Pack="true" PackagePath="\"/>
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
Expand Down
211 changes: 0 additions & 211 deletions src/libraries/System.Text.Json/src/System/Text/Json/JsonPropertyDictionary.ValueList.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/libraries/System.Text.Json/src/System/Text/Json/JsonPropertyDictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private void AddValue(string propertyName, T? value)
}
}

private bool TryAddValue(string propertyName, T? value)
internal bool TryAddValue(string propertyName, T? value)
{
if (IsReadOnly)
{
Expand Down Expand Up @@ -319,7 +319,7 @@ private void CreateDictionaryIfThresholdMet()
}
}

private bool ContainsValue(T? value)
internal bool ContainsValue(T? value)
{
foreach (T? item in GetValueCollection())
{
Expand Down
Loading