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

updated to 13.0.2, added pragmas #1902

Merged
merged 2 commits into from Jul 1, 2022
Merged

updated to 13.0.2, added pragmas #1902

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
6f7d57b
updated to 13.0.2, added pragmas
brentschmaltz Jun 29, 2022
9934704
review comments
brentschmaltz Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj
View file
Open in desktop
Expand Up @@ -13,11 +13,15 @@
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net472'">
<DefineConstants>$(DefineConstants);TRACE;DESKTOP;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;</DefineConstants>
<DefineConstants>$(DefineConstants);TRACE;DESKTOP;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CAS;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_REGEX_TIMEOUTS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0'">
<DefineConstants>$(DefineConstants);TRACE;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;$(AdditionalConstants)</DefineConstants>
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);TRACE;HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;HAVE_REGEX_TIMEOUTS;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<DefineConstants>$(DefineConstants);HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_ASYNC_DISPOSABLE;HAVE_BIG_INTEGER;HAVE_BINARY_FORMATTER;HAVE_BINARY_SERIALIZATION;HAVE_BINARY_EXCEPTION_SERIALIZATION;HAVE_CHAR_TO_LOWER_WITH_CULTURE;HAVE_CHAR_TO_STRING_WITH_CULTURE;HAVE_COM_ATTRIBUTES;HAVE_COMPONENT_MODEL;HAVE_CONCURRENT_COLLECTIONS;HAVE_COVARIANT_GENERICS;HAVE_DATA_CONTRACTS;HAVE_DATE_TIME_OFFSET;HAVE_DB_NULL_TYPE_CODE;HAVE_DYNAMIC;HAVE_EMPTY_TYPES;HAVE_ENTITY_FRAMEWORK;HAVE_EXPRESSIONS;HAVE_FAST_REVERSE;HAVE_FSHARP_TYPES;HAVE_FULL_REFLECTION;HAVE_GUID_TRY_PARSE;HAVE_HASH_SET;HAVE_ICLONEABLE;HAVE_ICONVERTIBLE;HAVE_IGNORE_DATA_MEMBER_ATTRIBUTE;HAVE_INOTIFY_COLLECTION_CHANGED;HAVE_INOTIFY_PROPERTY_CHANGING;HAVE_ISET;HAVE_LINQ;HAVE_MEMORY_BARRIER;HAVE_METHOD_IMPL_ATTRIBUTE;HAVE_NON_SERIALIZED_ATTRIBUTE;HAVE_READ_ONLY_COLLECTIONS;HAVE_REFLECTION_EMIT;HAVE_REGEX_TIMEOUTS;HAVE_SECURITY_SAFE_CRITICAL_ATTRIBUTE;HAVE_SERIALIZATION_BINDER_BIND_TO_NAME;HAVE_STREAM_READER_WRITER_CLOSE;HAVE_STRING_JOIN_WITH_ENUMERABLE;HAVE_TIME_SPAN_PARSE_WITH_CULTURE;HAVE_TIME_SPAN_TO_STRING_WITH_CULTURE;HAVE_TIME_ZONE_INFO;HAVE_TRACE_WRITER;HAVE_TYPE_DESCRIPTOR;HAVE_UNICODE_SURROGATE_DETECTION;HAVE_VARIANT_TYPE_PARAMETERS;HAVE_VERSION_TRY_PARSE;HAVE_XLINQ;HAVE_XML_DOCUMENT;HAVE_XML_DOCUMENT_TYPE;HAVE_CONCURRENT_DICTIONARY;HAVE_INDEXOF_STRING_COMPARISON;HAVE_REPLACE_STRING_COMPARISON;HAVE_REPLACE_STRING_COMPARISON;HAVE_GETHASHCODE_STRING_COMPARISON;HAVE_NULLABLE_ATTRIBUTES;HAVE_DYNAMIC_CODE_COMPILED;HAS_ARRAY_EMPTY;HAVE_DATE_ONLY;$(AdditionalConstants)</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Debug'">
Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonBinaryType.cs
View file
Open in desktop
Expand Up @@ -25,6 +25,8 @@

using System;

#nullable disable
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

disable

Do you know why this is required here and elsewhere? This seems to be needed where nullable is enabled by default but then in the /json/ dir, there's #endable tags which make it seem as though it's disabled by default.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That code is in the 13.0.2 branch and not in our last snapshot.


namespace Microsoft.IdentityModel.Json.Bson
{
internal enum BsonBinaryType : byte
Expand All @@ -41,4 +43,4 @@ internal enum BsonBinaryType : byte
Md5 = 0x05,
UserDefined = 0x80
}
}
}
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonBinaryWriter.cs
View file
Open in desktop
Expand Up @@ -29,6 +29,8 @@
using System.Text;
using Microsoft.IdentityModel.Json.Utilities;

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
internal class BsonBinaryWriter
Expand Down Expand Up @@ -325,4 +327,4 @@ private int CalculateSize(BsonToken t)
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonObjectId.cs
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
using System;
using Microsoft.IdentityModel.Json.Utilities;

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
/// <summary>
Expand Down Expand Up @@ -55,4 +57,4 @@ public BsonObjectId(byte[] value)
Value = value;
}
}
}
}
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonReader.cs
View file
Open in desktop
Expand Up @@ -32,6 +32,8 @@
using Microsoft.IdentityModel.Json.Utilities;
using Microsoft.IdentityModel.Json.Linq;

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
/// <summary>
Expand Down Expand Up @@ -831,4 +833,4 @@ private byte[] ReadBytes(int count)
return _reader.ReadBytes(count);
}
}
}
}
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonToken.cs
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
using System.Collections;
using System.Collections.Generic;

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
internal abstract class BsonToken
Expand Down Expand Up @@ -163,4 +165,4 @@ internal class BsonProperty
public BsonString Name { get; set; }
public BsonToken Value { get; set; }
}
}
}
4 changes: 3 additions & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonType.cs
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
// OTHER DEALINGS IN THE SOFTWARE.
#endregion

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
internal enum BsonType : sbyte
Expand All @@ -48,4 +50,4 @@ internal enum BsonType : sbyte
MinKey = -1,
MaxKey = 127
}
}
}
6 changes: 3 additions & 3 deletions src/Microsoft.IdentityModel.Tokens/opensource/json/Bson/BsonWriter.cs
View file
Open in desktop
Expand Up @@ -35,6 +35,8 @@
using Microsoft.IdentityModel.Json.Linq;
using System.Globalization;

#nullable disable

namespace Microsoft.IdentityModel.Json.Bson
{
/// <summary>
Expand Down Expand Up @@ -390,9 +392,7 @@ public override void WriteValue(char value)
#if HAVE_CHAR_TO_STRING_WITH_CULTURE
s = value.ToString(CultureInfo.InvariantCulture);
#else
#pragma warning disable CA1305 // Specify IFormatProvider
s = value.ToString();
#pragma warning restore CA1305 // Specify IFormatProvider
#endif
AddToken(new BsonString(s, true));
}
Expand Down Expand Up @@ -536,4 +536,4 @@ public void WriteRegex(string pattern, string options)
AddToken(new BsonRegex(pattern, options));
}
}
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/ConstructorHandling.cs
View file
Open in desktop
Expand Up @@ -40,4 +40,4 @@ internal enum ConstructorHandling
/// </summary>
AllowNonPublicDefaultConstructor = 1
}
}
}
24 changes: 14 additions & 10 deletions src/Microsoft.IdentityModel.Tokens/opensource/json/Converters/BinaryConverter.cs
View file
Open in desktop
Expand Up @@ -28,14 +28,14 @@
using System.Globalization;
using Microsoft.IdentityModel.Json.Utilities;
using System.Collections.Generic;
using System.Reflection;

using System.Diagnostics;
#if HAVE_ADO_NET
using System.Data.SqlTypes;
#endif

namespace Microsoft.IdentityModel.Json.Converters
{
#nullable enable
/// <summary>
/// Converts a binary value to and from a base 64 string value.
/// </summary>
Expand All @@ -44,7 +44,7 @@ internal class BinaryConverter : JsonConverter
#if HAVE_LINQ
private const string BinaryTypeName = "System.Data.Linq.Binary";
private const string BinaryToArrayName = "ToArray";
private static ReflectionObject _reflectionObject;
private static ReflectionObject? _reflectionObject;
#endif

/// <summary>
Expand All @@ -53,7 +53,7 @@ internal class BinaryConverter : JsonConverter
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
/// <param name="value">The value.</param>
/// <param name="serializer">The calling serializer.</param>
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
{
if (value == null)
{
Expand All @@ -72,7 +72,9 @@ private byte[] GetByteArray(object value)
if (value.GetType().FullName == BinaryTypeName)
{
EnsureReflectionObject(value.GetType());
return (byte[])_reflectionObject.GetValue(value, BinaryToArrayName);
MiscellaneousUtils.Assert(_reflectionObject != null);

return (byte[])_reflectionObject.GetValue(value, BinaryToArrayName)!;
}
#endif
#if HAVE_ADO_NET
Expand Down Expand Up @@ -103,7 +105,7 @@ private static void EnsureReflectionObject(Type t)
/// <param name="existingValue">The existing value of object being read.</param>
/// <param name="serializer">The calling serializer.</param>
/// <returns>The object value.</returns>
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.Null)
{
Expand All @@ -125,7 +127,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
{
// current token is already at base64 string
// unable to call ReadAsBytes so do it the old fashion way
string encodedData = reader.Value.ToString();
string encodedData = reader.Value!.ToString()!;
data = Convert.FromBase64String(encodedData);
}
else
Expand All @@ -134,15 +136,16 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
}

Type t = (ReflectionUtils.IsNullableType(objectType))
? Nullable.GetUnderlyingType(objectType)
? Nullable.GetUnderlyingType(objectType)!
: objectType;

#if HAVE_LINQ
if (t.FullName == BinaryTypeName)
{
EnsureReflectionObject(t);
MiscellaneousUtils.Assert(_reflectionObject != null);

return _reflectionObject.Creator(data);
return _reflectionObject.Creator!(data);
}
#endif

Expand Down Expand Up @@ -205,6 +208,7 @@ public override bool CanConvert(Type objectType)
return false;
}
}
#nullable disable
}

#endif
#endif
2 changes: 1 addition & 1 deletion src/Microsoft.IdentityModel.Tokens/opensource/json/Converters/BsonObjectIdConverter.cs
View file
Open in desktop
Expand Up @@ -88,4 +88,4 @@ public override bool CanConvert(Type objectType)
return (objectType == typeof(BsonObjectId));
}
}
}
}
8 changes: 5 additions & 3 deletions src/Microsoft.IdentityModel.Tokens/opensource/json/Converters/CustomCreationConverter.cs
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@

namespace Microsoft.IdentityModel.Json.Converters
{
#nullable enable
/// <summary>
/// Creates a custom object.
/// </summary>
Expand All @@ -41,7 +42,7 @@ internal abstract class CustomCreationConverter<T> : JsonConverter
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
/// <param name="value">The value.</param>
/// <param name="serializer">The calling serializer.</param>
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
{
throw new NotSupportedException("CustomCreationConverter should only be used while deserializing.");
}
Expand All @@ -54,7 +55,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
/// <param name="existingValue">The existing value of object being read.</param>
/// <param name="serializer">The calling serializer.</param>
/// <returns>The object value.</returns>
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.Null)
{
Expand Down Expand Up @@ -98,4 +99,5 @@ public override bool CanConvert(Type objectType)
/// </value>
public override bool CanWrite => false;
}
}
#nullable disable
}
16 changes: 9 additions & 7 deletions src/Microsoft.IdentityModel.Tokens/opensource/json/Converters/DataSetConverter.cs
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@

namespace Microsoft.IdentityModel.Json.Converters
{
#nullable enable
/// <summary>
/// Converts a <see cref="DataSet"/> to and from JSON.
/// </summary>
Expand All @@ -41,7 +42,7 @@ internal class DataSetConverter : JsonConverter
/// <param name="writer">The <see cref="JsonWriter"/> to write to.</param>
/// <param name="value">The value.</param>
/// <param name="serializer">The calling serializer.</param>
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
{
if (value == null)
{
Expand All @@ -50,7 +51,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
}

DataSet dataSet = (DataSet)value;
DefaultContractResolver resolver = serializer.ContractResolver as DefaultContractResolver;
DefaultContractResolver? resolver = serializer.ContractResolver as DefaultContractResolver;

DataTableConverter converter = new DataTableConverter();

Expand All @@ -74,7 +75,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
/// <param name="existingValue">The existing value of object being read.</param>
/// <param name="serializer">The calling serializer.</param>
/// <returns>The object value.</returns>
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.Null)
{
Expand All @@ -84,18 +85,18 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
// handle typed datasets
DataSet ds = (objectType == typeof(DataSet))
? new DataSet()
: (DataSet)Activator.CreateInstance(objectType);
: (DataSet)Activator.CreateInstance(objectType)!;

DataTableConverter converter = new DataTableConverter();

reader.ReadAndAssert();

while (reader.TokenType == JsonToken.PropertyName)
{
DataTable dt = ds.Tables[(string)reader.Value];
DataTable? dt = ds.Tables[(string)reader.Value!];
bool exists = (dt != null);

dt = (DataTable)converter.ReadJson(reader, typeof(DataTable), dt, serializer);
dt = (DataTable)converter.ReadJson(reader, typeof(DataTable), dt, serializer)!;

if (!exists)
{
Expand All @@ -120,6 +121,7 @@ public override bool CanConvert(Type valueType)
return typeof(DataSet).IsAssignableFrom(valueType);
}
}
#nullable disable
}

#endif
#endif