From 173179c8b45f49f16e00c5ba6b6f64b47ac9cd49 Mon Sep 17 00:00:00 2001 From: brentschmaltz Date: Fri, 1 Jul 2022 08:59:47 -0700 Subject: [PATCH] review comments --- .../Microsoft.IdentityModel.Tokens.csproj | 2 +- .../opensource/json/DefaultJsonNameTable.cs | 4 ---- .../opensource/json/JsonTextWriter.Async.cs | 2 +- .../opensource/json/SerializationBinder.cs | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj index 7fdf3eee9a..b3fabb4d3a 100644 --- a/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj +++ b/src/Microsoft.IdentityModel.Tokens/Microsoft.IdentityModel.Tokens.csproj @@ -21,7 +21,7 @@ - $(DefineConstants);HAVE_ADO_NET;HAVE_APP_DOMAIN;HAVE_ASYNC;HAVE_ASYNC_DISPOABLE;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);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) diff --git a/src/Microsoft.IdentityModel.Tokens/opensource/json/DefaultJsonNameTable.cs b/src/Microsoft.IdentityModel.Tokens/opensource/json/DefaultJsonNameTable.cs index 07d4df0213..8fc616a90e 100644 --- a/src/Microsoft.IdentityModel.Tokens/opensource/json/DefaultJsonNameTable.cs +++ b/src/Microsoft.IdentityModel.Tokens/opensource/json/DefaultJsonNameTable.cs @@ -80,11 +80,7 @@ public DefaultJsonNameTable() hashCode -= hashCode >> 5; // make sure index is evaluated before accessing _entries, otherwise potential race condition causing IndexOutOfRangeException -#if NET20 || NET35 || NET40 - int mask = Thread.VolatileRead(ref _mask); -#else int mask = Volatile.Read(ref _mask); -#endif var index = hashCode & mask; var entries = _entries; diff --git a/src/Microsoft.IdentityModel.Tokens/opensource/json/JsonTextWriter.Async.cs b/src/Microsoft.IdentityModel.Tokens/opensource/json/JsonTextWriter.Async.cs index 4c27e4b08e..aecb6d8fdf 100644 --- a/src/Microsoft.IdentityModel.Tokens/opensource/json/JsonTextWriter.Async.cs +++ b/src/Microsoft.IdentityModel.Tokens/opensource/json/JsonTextWriter.Async.cs @@ -147,7 +147,7 @@ private async Task CloseBufferAndWriterAsync() if (CloseOutput && _writer != null) { -#if HAVE_ASYNC_DISPOABLE +#if HAVE_ASYNC_DISPOSABLE await _writer.DisposeAsync().ConfigureAwait(false); #else // DisposeAsync isn't available. Instead, flush any remaining content with FlushAsync diff --git a/src/Microsoft.IdentityModel.Tokens/opensource/json/SerializationBinder.cs b/src/Microsoft.IdentityModel.Tokens/opensource/json/SerializationBinder.cs index 6789153205..61f6ec3b60 100644 --- a/src/Microsoft.IdentityModel.Tokens/opensource/json/SerializationBinder.cs +++ b/src/Microsoft.IdentityModel.Tokens/opensource/json/SerializationBinder.cs @@ -1,5 +1,5 @@  -#if (DOTNET || PORTABLE40 || PORTABLE) +#if (DOTNET || PORTABLE40 || PORTABLE || NET_CORE) using System; using System.Reflection;