System.Text.Json Migration - Adding code to parse the Project.Assets.Json file using STJ. #5558
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,13 +6,19 @@ | |
| using System.IO; | ||
| using Newtonsoft.Json; | ||
| using Newtonsoft.Json.Linq; | ||
| using NuGet.Common; | ||
| using NuGet.Packaging.Core; | ||
| using NuGet.Versioning; | ||
|
|
||
| namespace NuGet.ProjectModel | ||
| { | ||
| internal static class JsonUtility | ||
| { | ||
| private static readonly Dictionary<string, NuGetVersion> NuGetVersionCache = new(); | ||
| private static readonly Dictionary<string, VersionRange> VersionRangeCache = new(); | ||
|
|
||
| internal const string NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING = nameof(NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING); | ||
| internal static bool? UseNewtonsoftJson = null; | ||
| internal static readonly char[] PathSplitChars = new[] { LockFile.DirectorySeparatorChar }; | ||
|
|
||
| /// <summary> | ||
|
|
@@ -43,12 +49,35 @@ internal static JObject LoadJson(TextReader reader) | |
| } | ||
| } | ||
|
|
||
| internal static T LoadJson<T>(Stream stream, IUtf8JsonStreamReaderConverter<T> converter) | ||
| { | ||
| var streamingJsonReader = new Utf8JsonStreamReader(stream); | ||
| return converter.Read(ref streamingJsonReader); | ||
| } | ||
|
|
||
| internal static PackageDependency ReadPackageDependency(string property, JToken json) | ||
| { | ||
| var versionStr = json.Value<string>(); | ||
| return new PackageDependency( | ||
| property, | ||
| versionStr == null ? null : JsonUtility.ParseVersionRange(versionStr)); | ||
| } | ||
|
|
||
| internal static bool UseNewstonSoftJsonForParsing(IEnvironmentVariableReader environmentVariableReader, bool bypassCache) | ||
jgonz120 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| { | ||
| if (!UseNewtonsoftJson.HasValue || bypassCache) | ||
| { | ||
| if (bool.TryParse(environmentVariableReader.GetEnvironmentVariable(NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING), out var useNj)) | ||
| { | ||
| UseNewtonsoftJson = useNj; | ||
| } | ||
| else | ||
| { | ||
| UseNewtonsoftJson = false; | ||
| } | ||
| } | ||
|
|
||
| return UseNewtonsoftJson.Value; | ||
| } | ||
|
|
||
| internal static JProperty WritePackageDependencyWithLegacyString(PackageDependency item) | ||
|
|
@@ -141,5 +170,36 @@ internal static JToken WriteString(string item) | |
| { | ||
| return item != null ? new JValue(item) : JValue.CreateNull(); | ||
| } | ||
|
|
||
| internal static NuGetVersion ParseNugetVersion(string value) | ||
|
||
| { | ||
| if (!NuGetVersionCache.ContainsKey(value)) | ||
| { | ||
| var result = NuGetVersion.Parse(value); | ||
| NuGetVersionCache[value] = result; | ||
| } | ||
| return NuGetVersionCache[value]; | ||
| } | ||
|
|
||
| internal static bool TryParseNugetVersion(string value, out NuGetVersion version) | ||
| { | ||
| if (!NuGetVersionCache.ContainsKey(value)) | ||
| { | ||
| _ = NuGetVersion.TryParse(value, out version); | ||
| NuGetVersionCache[value] = version; | ||
| } | ||
| version = NuGetVersionCache[value]; | ||
| return version is not null; | ||
| } | ||
|
|
||
| internal static VersionRange ParseVersionRange(string value) | ||
| { | ||
| if (!VersionRangeCache.ContainsKey(value)) | ||
| { | ||
| var result = VersionRange.Parse(value); | ||
| VersionRangeCache[value] = result; | ||
| } | ||
| return VersionRangeCache[value]; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| // Copyright (c) .NET Foundation. All rights reserved. | ||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
| #nullable enable | ||
|
|
||
| using System; | ||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
|
|
||
| namespace NuGet.ProjectModel | ||
| { | ||
| /// <summary> | ||
| /// Splits a string by a delimiter, producing substrings lazily during enumeration. | ||
| /// Skips empty items, behaving equivalently to <see cref="string.Split(char[])"/> with | ||
| /// <see cref="StringSplitOptions.RemoveEmptyEntries"/>. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// Unlike <see cref="string.Split(char[])"/> and overloads, <see cref="LazyStringSplit"/> | ||
| /// does not allocate an array for the return, and allocates strings on demand during | ||
| /// enumeration. A custom enumerator type is used so that the only allocations made are | ||
| /// the substrings themselves. We also avoid the large internal arrays assigned by the | ||
| /// methods on <see cref="string"/>. | ||
| /// </remarks> | ||
| internal readonly struct LazyStringSplit : IEnumerable<string> | ||
jgonz120 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| private readonly string _input; | ||
| private readonly char _delimiter; | ||
|
|
||
| public LazyStringSplit(string input, char delimiter) | ||
| { | ||
| if (input is null) | ||
| { | ||
| throw new ArgumentNullException(nameof(input)); | ||
| } | ||
|
|
||
| _input = input; | ||
| _delimiter = delimiter; | ||
| } | ||
|
|
||
| public Enumerator GetEnumerator() => new(this); | ||
|
|
||
| IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); | ||
|
|
||
| IEnumerator<string> IEnumerable<string>.GetEnumerator() => GetEnumerator(); | ||
|
|
||
| public IEnumerable<T> Select<T>(Func<string, T> func) | ||
| { | ||
| foreach (string value in this) | ||
| { | ||
| yield return func(value); | ||
| } | ||
| } | ||
|
|
||
| public string First() | ||
| { | ||
| return FirstOrDefault() ?? throw new InvalidOperationException("Sequence is empty."); | ||
| } | ||
|
|
||
| public string? FirstOrDefault() | ||
| { | ||
| var enumerator = new Enumerator(this); | ||
| return enumerator.MoveNext() ? enumerator.Current : null; | ||
| } | ||
|
|
||
| public struct Enumerator : IEnumerator<string> | ||
| { | ||
| private readonly string _input; | ||
| private readonly char _delimiter; | ||
| private int _index; | ||
|
|
||
| internal Enumerator(in LazyStringSplit split) | ||
| { | ||
| _index = 0; | ||
| _input = split._input; | ||
| _delimiter = split._delimiter; | ||
| Current = null!; | ||
| } | ||
|
|
||
| public string Current { get; private set; } | ||
|
|
||
| public bool MoveNext() | ||
| { | ||
| while (_index != _input.Length) | ||
| { | ||
| int delimiterIndex = _input.IndexOf(_delimiter, _index); | ||
|
|
||
| if (delimiterIndex == -1) | ||
| { | ||
| Current = _input.Substring(_index); | ||
| _index = _input.Length; | ||
| return true; | ||
| } | ||
|
|
||
| int length = delimiterIndex - _index; | ||
|
|
||
| if (length == 0) | ||
| { | ||
| _index++; | ||
| continue; | ||
| } | ||
|
|
||
| Current = _input.Substring(_index, length); | ||
| _index = delimiterIndex + 1; | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| object IEnumerator.Current => Current; | ||
|
|
||
| void IEnumerator.Reset() | ||
| { | ||
| _index = 0; | ||
| Current = null!; | ||
| } | ||
|
|
||
| void IDisposable.Dispose() { } | ||
| } | ||
| } | ||
|
|
||
| internal static class LazyStringSplitExtensions | ||
| { | ||
| /// <remarks> | ||
| /// This extension method has special knowledge of the <see cref="LazyStringSplit"/> type and | ||
| /// can compute its result without allocation. | ||
| /// </remarks> | ||
| /// <inheritdoc cref="Enumerable.FirstOrDefault{TSource}(IEnumerable{TSource})"/> | ||
| public static string? FirstOrDefault(this LazyStringSplit lazyStringSplit) | ||
| { | ||
| LazyStringSplit.Enumerator enumerator = lazyStringSplit.GetEnumerator(); | ||
|
|
||
| return enumerator.MoveNext() | ||
| ? enumerator.Current | ||
| : null; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.