Arrange files

src/NuGet.Core/NuGet.ProjectModel/StreamingUtf8JsonPackageSpecReader.cs

@@ -21,7 +21,6 @@ namespace NuGet.ProjectModel
     internal static class StreamingUtf8JsonPackageSpecReader
     {
         private static readonly char[] VersionSeparators = new[] { ';' };
-
         private static readonly byte[] Utf8Authors = Encoding.UTF8.GetBytes("authors");
         private static readonly byte[] BuildOptionsUtf8 = Encoding.UTF8.GetBytes("buildOptions");
         private static readonly byte[] Utf8ContentFiles = Encoding.UTF8.GetBytes("contentFiles");
@@ -116,12 +115,12 @@ internal static class StreamingUtf8JsonPackageSpecReader
         /// </summary>
         /// <param name="name">project name</param>
         /// <param name="packageSpecPath">file path</param>
-        public static PackageSpec GetPackageSpec(string name, string packageSpecPath)
+        internal static PackageSpec GetPackageSpec(string name, string packageSpecPath)
         {
             return FileUtility.SafeRead(filePath: packageSpecPath, read: (stream, filePath) => GetPackageSpec(stream, name, filePath, null));
         }
 
-        public static PackageSpec GetPackageSpec(Stream stream, string name, string packageSpecPath, string snapshotValue)
+        internal static PackageSpec GetPackageSpec(Stream stream, string name, string packageSpecPath, string snapshotValue)
         {
             var reader = new StreamingUtf8JsonReader(stream);
             PackageSpec packageSpec;
@@ -303,95 +302,7 @@ internal static PackageSpec GetPackageSpec(ref StreamingUtf8JsonReader jsonReade
             return packageSpec;
         }
 
-        private static PackageType CreatePackageType(ref StreamingUtf8JsonReader jsonReader)
-        {
-            var name = jsonReader.GetString();
-
-            return new PackageType(name, Packaging.Core.PackageType.EmptyVersion);
-        }
-
-        [Obsolete]
-        private static void ReadBuildOptions(ref StreamingUtf8JsonReader jsonReader, PackageSpec packageSpec)
-        {
-            packageSpec.BuildOptions = new BuildOptions();
-
-            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
-            {
-                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
-                {
-                    if (jsonReader.ValueTextEquals(Utf8OutputName))
-                    {
-                        packageSpec.BuildOptions.OutputName = jsonReader.ReadNextTokenAsString();
-                    }
-                    else
-                    {
-                        jsonReader.TrySkip();
-                    }
-                }
-            }
-        }
-
-        private static void ReadCentralPackageVersions(
-            ref StreamingUtf8JsonReader jsonReader,
-            IDictionary<string, CentralPackageVersion> centralPackageVersions)
-        {
-            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
-            {
-                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
-                {
-                    var propertyName = jsonReader.GetString();
-
-                    if (string.IsNullOrEmpty(propertyName))
-                    {
-                        var exception = new JsonException("Unable to resolve central version ''.");
-                        throw exception;
-                    }
-
-                    string version = jsonReader.ReadNextTokenAsString();
-
-                    if (string.IsNullOrEmpty(version))
-                    {
-                        var exception = new JsonException("The version cannot be null or empty.");
-                        throw exception;
-                    }
-
-                    centralPackageVersions[propertyName] = new CentralPackageVersion(propertyName, VersionRange.Parse(version));
-                }
-            }
-        }
-
-        private static CompatibilityProfile ReadCompatibilityProfile(ref StreamingUtf8JsonReader jsonReader, string profileName)
-        {
-            List<FrameworkRuntimePair> sets = null;
-
-            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
-            {
-                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
-                {
-                    var propertyName = jsonReader.GetString();
-                    sets = sets ?? new List<FrameworkRuntimePair>();
-
-                    IReadOnlyList<string> values = jsonReader.ReadNextStringOrArrayOfStringsAsReadOnlyList() ?? Array.Empty<string>();
-
-                    IEnumerable<FrameworkRuntimePair> profiles = ReadCompatibilitySets(values, propertyName);
-
-                    sets.AddRange(profiles);
-                }
-            }
-            return new CompatibilityProfile(profileName, sets ?? Enumerable.Empty<FrameworkRuntimePair>());
-        }
-
-        private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(IReadOnlyList<string> values, string compatibilitySetName)
-        {
-            NuGetFramework framework = NuGetFramework.Parse(compatibilitySetName);
-
-            foreach (string value in values)
-            {
-                yield return new FrameworkRuntimePair(framework, value);
-            }
-        }
-
-        internal static void ReadDependencies(
+                internal static void ReadDependencies(
                     ref StreamingUtf8JsonReader jsonReader,
                     IList<LibraryDependency> results,
                     string packageSpecPath,
@@ -678,6 +589,94 @@ internal static void ReadCentralTransitiveDependencyGroup(
             }
         }
 
+        private static PackageType CreatePackageType(ref StreamingUtf8JsonReader jsonReader)
+        {
+            var name = jsonReader.GetString();
+
+            return new PackageType(name, Packaging.Core.PackageType.EmptyVersion);
+        }
+
+        [Obsolete]
+        private static void ReadBuildOptions(ref StreamingUtf8JsonReader jsonReader, PackageSpec packageSpec)
+        {
+            packageSpec.BuildOptions = new BuildOptions();
+
+            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
+            {
+                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
+                {
+                    if (jsonReader.ValueTextEquals(Utf8OutputName))
+                    {
+                        packageSpec.BuildOptions.OutputName = jsonReader.ReadNextTokenAsString();
+                    }
+                    else
+                    {
+                        jsonReader.TrySkip();
+                    }
+                }
+            }
+        }
+
+        private static void ReadCentralPackageVersions(
+            ref StreamingUtf8JsonReader jsonReader,
+            IDictionary<string, CentralPackageVersion> centralPackageVersions)
+        {
+            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
+            {
+                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
+                {
+                    var propertyName = jsonReader.GetString();
+
+                    if (string.IsNullOrEmpty(propertyName))
+                    {
+                        var exception = new JsonException("Unable to resolve central version ''.");
+                        throw exception;
+                    }
+
+                    string version = jsonReader.ReadNextTokenAsString();
+
+                    if (string.IsNullOrEmpty(version))
+                    {
+                        var exception = new JsonException("The version cannot be null or empty.");
+                        throw exception;
+                    }
+
+                    centralPackageVersions[propertyName] = new CentralPackageVersion(propertyName, VersionRange.Parse(version));
+                }
+            }
+        }
+
+        private static CompatibilityProfile ReadCompatibilityProfile(ref StreamingUtf8JsonReader jsonReader, string profileName)
+        {
+            List<FrameworkRuntimePair> sets = null;
+
+            if (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.StartObject)
+            {
+                while (jsonReader.Read() && jsonReader.TokenType == JsonTokenType.PropertyName)
+                {
+                    var propertyName = jsonReader.GetString();
+                    sets = sets ?? new List<FrameworkRuntimePair>();
+
+                    IReadOnlyList<string> values = jsonReader.ReadNextStringOrArrayOfStringsAsReadOnlyList() ?? Array.Empty<string>();
+
+                    IEnumerable<FrameworkRuntimePair> profiles = ReadCompatibilitySets(values, propertyName);
+
+                    sets.AddRange(profiles);
+                }
+            }
+            return new CompatibilityProfile(profileName, sets ?? Enumerable.Empty<FrameworkRuntimePair>());
+        }
+
+        private static IEnumerable<FrameworkRuntimePair> ReadCompatibilitySets(IReadOnlyList<string> values, string compatibilitySetName)
+        {
+            NuGetFramework framework = NuGetFramework.Parse(compatibilitySetName);
+
+            foreach (string value in values)
+            {
+                yield return new FrameworkRuntimePair(framework, value);
+            }
+        }
+
         private static void ReadDownloadDependencies(
             ref StreamingUtf8JsonReader jsonReader,
             IList<DownloadDependency> downloadDependencies,

src/NuGet.Core/NuGet.ProjectModel/StreamingUtf8JsonReader.cs

@@ -12,6 +12,7 @@ namespace NuGet.ProjectModel
 {
 
     internal ref struct StreamingUtf8JsonReader
+
     {
         private static readonly char[] DelimitedStringDelimiters = new char[] { ' ', ',' };
 
@@ -20,7 +21,7 @@ internal ref struct StreamingUtf8JsonReader
         private byte[] _buffer;
         private Stream _stream;
 
-        public StreamingUtf8JsonReader(Stream stream)
+        internal StreamingUtf8JsonReader(Stream stream)
         {
             if (stream is null)
             {
@@ -46,25 +47,25 @@ public StreamingUtf8JsonReader(Stream stream)
             _reader.Read();
         }
 
-        public bool IsFinalBlock => _reader.IsFinalBlock;
+        internal bool IsFinalBlock => _reader.IsFinalBlock;
 
-        public int BufferSize => _buffer.Length;
+        internal int BufferSize => _buffer.Length;
 
-        public JsonTokenType TokenType => _reader.TokenType;
+        internal JsonTokenType TokenType => _reader.TokenType;
 
-        public bool ValueTextEquals(ReadOnlySpan<byte> utf8Text) => _reader.ValueTextEquals(utf8Text);
+        internal bool ValueTextEquals(ReadOnlySpan<byte> utf8Text) => _reader.ValueTextEquals(utf8Text);
 
-        public bool ValueTextEquals(string text) => _reader.ValueTextEquals(text);
+        internal bool ValueTextEquals(string text) => _reader.ValueTextEquals(text);
 
-        public bool TryGetInt32(out int value) => _reader.TryGetInt32(out value);
+        internal bool TryGetInt32(out int value) => _reader.TryGetInt32(out value);
 
-        public string GetString() => _reader.GetString();
+        internal string GetString() => _reader.GetString();
 
-        public bool GetBoolean() => _reader.GetBoolean();
+        internal bool GetBoolean() => _reader.GetBoolean();
 
-        public int GetInt32() => _reader.GetInt32();
+        internal int GetInt32() => _reader.GetInt32();
 
-        public bool Read()
+        internal bool Read()
         {
             bool wasRead;
             while (!(wasRead = _reader.Read()) && !_reader.IsFinalBlock)
@@ -74,7 +75,7 @@ public bool Read()
             return wasRead;
         }
 
-        public bool TrySkip()
+        internal bool TrySkip()
         {
             bool wasSkipped;
             while (!(wasSkipped = _reader.TrySkip()) && !_reader.IsFinalBlock)
@@ -84,7 +85,7 @@ public bool TrySkip()
             return wasSkipped;
         }
 
-        public IList<T> ReadObjectAsList<T>(JsonSerializerOptions options)
+        internal IList<T> ReadObjectAsList<T>(JsonSerializerOptions options)
         {
             if (TokenType != JsonTokenType.StartObject)
             {
@@ -111,7 +112,7 @@ public IList<T> ReadObjectAsList<T>(JsonSerializerOptions options)
             return listObjects;
         }
 
-        public void ReadArrayOfObjects<T1, T2>(JsonSerializerOptions options, IList<T2> objectList) where T1 : T2
+        internal void ReadArrayOfObjects<T1, T2>(JsonSerializerOptions options, IList<T2> objectList) where T1 : T2
         {
             if (objectList is null)
             {
@@ -134,7 +135,7 @@ public void ReadArrayOfObjects<T1, T2>(JsonSerializerOptions options, IList<T2>
             }
         }
 
-        public string ReadNextTokenAsString()
+        internal string ReadNextTokenAsString()
         {
             if (Read())
             {
@@ -144,9 +145,9 @@ public string ReadNextTokenAsString()
             return null;
         }
 
-        public string GetCurrentBufferAsString() => Encoding.UTF8.GetString(_buffer);
+        internal string GetCurrentBufferAsString() => Encoding.UTF8.GetString(_buffer);
 
-        public IList<string> ReadStringArrayAsIList(IList<string> strings = null)
+        internal IList<string> ReadStringArrayAsIList(IList<string> strings = null)
         {
             if (TokenType == JsonTokenType.StartArray)
             {
@@ -183,7 +184,7 @@ internal IReadOnlyList<string> ReadDelimitedString()
             return null;
         }
 
-        public List<string> ReadStringArrayAsList(List<string> strings = null)
+        internal List<string> ReadStringArrayAsList(List<string> strings = null)
         {
             if (TokenType == JsonTokenType.StartArray)
             {

src/NuGet.Core/NuGet.ProjectModel/Utf8JsonReaderExtensions.cs

@@ -190,7 +190,7 @@ internal static IReadOnlyList<string> ReadStringArrayAsReadOnlyListFromArrayStar
             return (IReadOnlyList<string>)strings ?? Array.Empty<string>();
         }
 
-        public static string ReadTokenAsString(this ref Utf8JsonReader reader)
+        internal static string ReadTokenAsString(this ref Utf8JsonReader reader)
         {
             switch (reader.TokenType)
             {