Move Utf8JsonStreamReader & extensions to NuGet Shared (#6834)

Author: donnie-msft

NuGet.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31418.319
+# Visual Studio Version 18
+VisualStudioVersion = 18.3.11101.62
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BD1946CE-5544-4F28-A04A-9C3D51113E1A}"
 EndProject
@@ -45,6 +45,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{DE23D0
 		build\Shared\TaskResult.cs = build\Shared\TaskResult.cs
 		build\Shared\TypeExtensions.cs = build\Shared\TypeExtensions.cs
 		build\Shared\TypeInfo.cs = build\Shared\TypeInfo.cs
+		build\Shared\Utf8JsonReaderExtensions.cs = build\Shared\Utf8JsonReaderExtensions.cs
+		build\Shared\Utf8JsonStreamReader.cs = build\Shared\Utf8JsonStreamReader.cs
+		build\Shared\Utf8JsonStreamReaderConverter.cs = build\Shared\Utf8JsonStreamReaderConverter.cs
 		build\Shared\vs-threading.MainThreadAssertingMethods.txt = build\Shared\vs-threading.MainThreadAssertingMethods.txt
 		build\Shared\vs-threading.MainThreadSwitchingMethods.txt = build\Shared\vs-threading.MainThreadSwitchingMethods.txt
 		build\Shared\vs-threading.MembersRequiringMainThread.txt = build\Shared\vs-threading.MembersRequiringMainThread.txt

…udio/Migrate/Utf8JsonReaderExtensions.cs build/Shared/Utf8JsonReaderExtensions.cssrc/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Migrate/Utf8JsonReaderExtensions.cs renamed to build/Shared/Utf8JsonReaderExtensions.cs src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Migrate/Utf8JsonReaderExtensions.cs renamed to build/Shared/Utf8JsonReaderExtensions.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Text.Json;
 
-namespace NuGet.PackageManagement.VisualStudio.Migrate
+namespace NuGet.Shared
 {
     internal static class Utf8JsonReaderExtensions
     {

…Get.ProjectModel/Utf8JsonStreamReader.cs build/Shared/Utf8JsonStreamReader.cssrc/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs renamed to build/Shared/Utf8JsonStreamReader.cs src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs renamed to build/Shared/Utf8JsonStreamReader.cs

@@ -11,7 +11,7 @@
 using System.Text;
 using System.Text.Json;
 
-namespace NuGet.ProjectModel
+namespace NuGet.Shared
 {
     /// <summary>
     /// This struct is used to read over a memeory stream in parts, in order to avoid reading the entire stream into memory.
@@ -270,7 +270,7 @@ internal bool ReadNextTokenAsBoolOrFalse()
             return false;
         }
 
-        internal bool ReadNextTokenAsBoolOrThrowAnException(byte[] propertyName)
+        internal bool ReadNextTokenAsBoolOrThrowAnException(byte[] propertyName, string invalidAttributeString)
         {
             ThrowExceptionIfDisposed();
 
@@ -282,7 +282,7 @@ internal bool ReadNextTokenAsBoolOrThrowAnException(byte[] propertyName)
             {
                 throw new ArgumentException(
                     string.Format(CultureInfo.CurrentCulture,
-                    Strings.Invalid_AttributeValue,
+                    invalidAttributeString,
                     Encoding.UTF8.GetString(propertyName),
                     _reader.ReadTokenAsString(),
                     "false"));

…ctModel/Utf8JsonStreamReaderConverter.cs …/Shared/Utf8JsonStreamReaderConverter.cssrc/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReaderConverter.cs renamed to build/Shared/Utf8JsonStreamReaderConverter.cs src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReaderConverter.cs renamed to build/Shared/Utf8JsonStreamReaderConverter.cs

@@ -1,6 +1,6 @@
 // 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.
-namespace NuGet.ProjectModel
+namespace NuGet.Shared
 {
     /// <summary>
     /// An abstract class that defines a function for reading a <see cref="Utf8JsonStreamReader"/> into a <typeparamref name="T"/>

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/GlobalSuppressions.cs

@@ -116,4 +116,3 @@
 [assembly: SuppressMessage("Reliability", "CA2016:Forward the 'CancellationToken' parameter to methods", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.PackageManagement.VisualStudio.VsManagedLanguagesProjectSystemServices.GetPackageReferencesAsync(NuGet.Frameworks.NuGetFramework,System.Threading.CancellationToken)~System.Threading.Tasks.Task{System.Collections.Generic.IEnumerable{NuGet.LibraryModel.LibraryDependency}}")]
 [assembly: SuppressMessage("Reliability", "CA2016:Forward the 'CancellationToken' parameter to methods", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.PackageManagement.VisualStudio.VsManagedLanguagesProjectSystemServices.GetProjectReferencesAsync(NuGet.Common.ILogger,System.Threading.CancellationToken)~System.Threading.Tasks.Task{System.Collections.Generic.IEnumerable{NuGet.ProjectModel.ProjectRestoreReference}}")]
 [assembly: SuppressMessage("Reliability", "CA2016:Forward the 'CancellationToken' parameter to methods", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.PackageManagement.VisualStudio.VsMSBuildProjectSystem.SaveProjectAsync(System.Threading.CancellationToken)~System.Threading.Tasks.Task")]
-[assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.PackageManagement.VisualStudio.Migrate.Utf8JsonReaderExtensions.ReadNumberAsString(System.Text.Json.Utf8JsonReader@)~System.String")]

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Migrate/ProjectJsonMigrationCandidatePackageSpecReader.cs

@@ -14,6 +14,7 @@
 using NuGet.LibraryModel;
 using NuGet.ProjectModel;
 using NuGet.RuntimeModel;
+using NuGet.Shared;
 using NuGet.Versioning;
 using FileFormatException = NuGet.ProjectModel.FileFormatException;
 

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/Migrate/Utf8JsonStreamReader.cs

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NETFXTargetFramework)</TargetFramework>
     <Shipping>true</Shipping>
@@ -73,6 +73,9 @@
     <Compile Include="$(SharedDirectory)\RequiredModifierAttributes.cs" />
     <Compile Include="$(SharedDirectory)\SharedExtensions.cs" />
     <Compile Include="$(SharedDirectory)\TaskResult.cs" />
+    <Compile Include="$(SharedDirectory)\Utf8JsonReaderExtensions.cs" />
+    <Compile Include="$(SharedDirectory)\Utf8JsonStreamReader.cs" />
+    <Compile Include="$(SharedDirectory)\Utf8JsonStreamReaderConverter.cs" />
     <Compile Include="$(SharedDirectory)\XmlUtility.cs" />
   </ItemGroup>
 

src/NuGet.Clients/NuGet.PackageManagement.VisualStudio/NuGet.PackageManagement.VisualStudio.csproj

@@ -11,6 +11,7 @@
 using Newtonsoft.Json;
 using NuGet.Common;
 using NuGet.Packaging;
+using NuGet.Shared;
 
 namespace NuGet.ProjectModel
 {

src/NuGet.Core/NuGet.ProjectModel/DependencyGraphSpec.cs

@@ -70,9 +70,6 @@
 [assembly: SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "<Pending>", Scope = "member", Target = "~P:NuGet.ProjectModel.LockFile.CentralTransitiveDependencyGroups")]
 [assembly: SuppressMessage("Usage", "CA2227:Collection properties should be read only", Justification = "IReadOnlySet<T> is only available in .NET 5+, so we need to use a HashSet<T> here.", Scope = "member", Target = "~P:NuGet.ProjectModel.RestoreAuditProperties.SuppressedAdvisories")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.LockFileFormat.Utf8JsonRead(System.IO.Stream,NuGet.Common.ILogger,System.String,NuGet.ProjectModel.LockFileReadFlags)~NuGet.ProjectModel.LockFile")]
-[assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.Utf8JsonStreamLockFileConverter.Read(NuGet.ProjectModel.Utf8JsonStreamReader@,NuGet.ProjectModel.LockFileReadFlags)~NuGet.ProjectModel.LockFile")]
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.PackageSpecReferenceDependencyProvider.AddLibraryProperties(NuGet.LibraryModel.Library,NuGet.ProjectModel.PackageSpec,NuGet.Frameworks.NuGetFramework)")]
 [assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.ProjectRestoreMetadata.GetSources(System.Collections.Generic.IList{NuGet.Configuration.PackageSource})~System.Collections.Generic.HashSet{System.String}")]
-[assembly: SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.Utf8JsonStreamLockFileTargetLibraryConverter.ReadPackageDependencyList(NuGet.ProjectModel.Utf8JsonStreamReader@)~System.Collections.Generic.IList{NuGet.Packaging.Core.PackageDependency}")]
-[assembly: SuppressMessage("Globalization", "CA1305:Specify IFormatProvider", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.Utf8JsonReaderExtensions.ReadNumberAsString(System.Text.Json.Utf8JsonReader@)~System.String")]
 [assembly: SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.ProjectModel.AssetsLogMessage.#ctor(NuGet.Common.LogLevel,NuGet.Common.NuGetLogCode,System.String,System.String,System.String,System.String,System.Collections.Generic.IReadOnlyList{System.String},System.Int32,System.Int32,System.Int32,System.Int32)")]