React to System.Text.Json changes

nguerrera · nguerrera · commit 756f905963d5 · 2019-06-27T11:03:38.000-07:00
diff --git a/src/dotnet/ToolManifest/JsonElementExtension.cs b/src/dotnet/ToolManifest/JsonElementExtension.cs
@@ -15,12 +15,12 @@ internal static bool TryGetStringValue(this JsonElement element, string name, ou
             value = null;
             if (element.TryGetProperty(name, out JsonElement jsonValue))
             {
-                if (jsonValue.Type != JsonValueType.String)
+                if (jsonValue.ValueKind != JsonValueKind.String)
                 {
                     throw new ToolManifestException(
                         string.Format(
                             LocalizableStrings.UnexpectedTypeInJson,
-                            JsonValueType.String.ToString(),
+                            JsonValueKind.String.ToString(),
                             name));
                 }
                 value = jsonValue.GetString();
@@ -35,12 +35,12 @@ internal static bool TryGetInt32Value(this JsonElement element, string name, out
             value = default;
             if (element.TryGetProperty(name, out JsonElement jsonValue))
             {
-                if (jsonValue.Type != JsonValueType.Number)
+                if (jsonValue.ValueKind != JsonValueKind.Number)
                 {
                     throw new ToolManifestException(
                         string.Format(
                             LocalizableStrings.UnexpectedTypeInJson,
-                            JsonValueType.Number.ToString(),
+                            JsonValueKind.Number.ToString(),
                             name));
                 }
                 value = jsonValue.GetInt32();
@@ -55,12 +55,12 @@ internal static bool TryGetBooleanValue(this JsonElement element, string name, o
             value = default;
             if (element.TryGetProperty(name, out JsonElement jsonValue))
             {
-                if (!(jsonValue.Type == JsonValueType.True || jsonValue.Type == JsonValueType.False))
+                if (!(jsonValue.ValueKind == JsonValueKind.True || jsonValue.ValueKind == JsonValueKind.False))
                 {
                     throw new ToolManifestException(
                         string.Format(
                             LocalizableStrings.UnexpectedTypeInJson,
-                            JsonValueType.True.ToString() + "|" + JsonValueType.False.ToString(),
+                            JsonValueKind.True.ToString() + "|" + JsonValueKind.False.ToString(),
                             name));
                 }
                 value = jsonValue.GetBoolean();
diff --git a/src/dotnet/ToolManifest/ToolManifestEditor.cs b/src/dotnet/ToolManifest/ToolManifestEditor.cs
@@ -164,11 +164,11 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po
                         serializableLocalToolsManifest.Tools =
                             new List<SerializableLocalToolSinglePackage>();
 
-                        if (tools.Type != JsonValueType.Object)
+                        if (tools.ValueKind != JsonValueKind.Object)
                         {
                             throw new ToolManifestException(
                                 string.Format(LocalizableStrings.UnexpectedTypeInJson,
-                                    JsonValueType.Object.ToString(),
+                                    JsonValueKind.Object.ToString(),
                                     JsonPropertyTools));
                         }
 
@@ -184,21 +184,21 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po
                             var commands = new List<string>();
                             if (toolJson.Value.TryGetProperty(JsonPropertyCommands, out var commandsJson))
                             {
-                                if (commandsJson.Type != JsonValueType.Array)
+                                if (commandsJson.ValueKind != JsonValueKind.Array)
                                 {
                                     throw new ToolManifestException(
                                         string.Format(LocalizableStrings.UnexpectedTypeInJson,
-                                            JsonValueType.Array.ToString(),
+                                            JsonValueKind.Array.ToString(),
                                             JsonPropertyCommands));
                                 }
 
                                 foreach (var command in commandsJson.EnumerateArray())
                                 {
-                                    if (command.Type != JsonValueType.String)
+                                    if (command.ValueKind != JsonValueKind.String)
                                     {
                                         throw new ToolManifestException(
                                             string.Format(LocalizableStrings.UnexpectedTypeInJson,
-                                                JsonValueType.String.ToString(),
+                                                JsonValueKind.String.ToString(),
                                                 "command"));
                                     }
 
diff --git a/src/dotnet/ToolPackage/LocalToolsResolverCache.cs b/src/dotnet/ToolPackage/LocalToolsResolverCache.cs
@@ -51,7 +51,7 @@ public void Save(
 
                     _fileSystem.File.WriteAllText(
                         packageCacheFile,
-                        JsonSerializer.ToString(existingCacheTable.Concat(diffedRow)));
+                        JsonSerializer.Serialize(existingCacheTable.Concat(diffedRow)));
                 }
                 else
                 {
@@ -64,7 +64,7 @@ public void Save(
 
                     _fileSystem.File.WriteAllText(
                         packageCacheFile,
-                        JsonSerializer.ToString(rowsToAdd));
+                        JsonSerializer.Serialize(rowsToAdd));
                 }
             }
         }
@@ -96,7 +96,7 @@ private CacheRow[] GetCacheTable(string packageCacheFile)
             try
             {
                 cacheTable =
-                    JsonSerializer.Parse<CacheRow[]>(_fileSystem.File.ReadAllText(packageCacheFile));
+                    JsonSerializer.Deserialize<CacheRow[]>(_fileSystem.File.ReadAllText(packageCacheFile));
             }
             catch (JsonException)
             {
diff --git a/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs b/src/dotnet/commands/dotnet-run/LaunchSettings/LaunchSettingsManager.cs
@@ -29,7 +29,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett
                 {
                     var model = document.RootElement;
 
-                    if (model.Type != JsonValueType.Object || !model.TryGetProperty(ProfilesKey, out var profilesObject) || profilesObject.Type != JsonValueType.Object)
+                    if (model.ValueKind != JsonValueKind.Object || !model.TryGetProperty(ProfilesKey, out var profilesObject) || profilesObject.ValueKind != JsonValueKind.Object)
                     {
                         return new LaunchSettingsApplyResult(false, LocalizableStrings.LaunchProfilesCollectionIsNotAJsonObject);
                     }
@@ -43,19 +43,19 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett
                     }
                     else
                     {
-                        if (!profilesObject.TryGetProperty(profileName, out profileObject) || profileObject.Type != JsonValueType.Object)
+                        if (!profilesObject.TryGetProperty(profileName, out profileObject) || profileObject.ValueKind != JsonValueKind.Object)
                         {
                             return new LaunchSettingsApplyResult(false, LocalizableStrings.LaunchProfileIsNotAJsonObject);
                         }
                     }
 
-                    if (profileObject.Type == default)
+                    if (profileObject.ValueKind == default)
                     {
                         foreach (var prop in profilesObject.EnumerateObject())
                         {
-                            if (prop.Value.Type == JsonValueType.Object)
+                            if (prop.Value.ValueKind == JsonValueKind.Object)
                             {
-                                if (prop.Value.TryGetProperty(CommandNameKey, out var commandNameElement) && commandNameElement.Type == JsonValueType.String)
+                                if (prop.Value.TryGetProperty(CommandNameKey, out var commandNameElement) && commandNameElement.ValueKind == JsonValueKind.String)
                                 {
                                     if (_providers.ContainsKey(commandNameElement.GetString()))
                                     {
@@ -67,13 +67,13 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett
                         }
                     }
 
-                    if (profileObject.Type == default)
+                    if (profileObject.ValueKind == default)
                     {
                         return new LaunchSettingsApplyResult(false, LocalizableStrings.UsableLaunchProfileCannotBeLocated);
                     }
 
                     if (!profileObject.TryGetProperty(CommandNameKey, out var finalCommandNameElement)
-                        || finalCommandNameElement.Type != JsonValueType.String)
+                        || finalCommandNameElement.ValueKind != JsonValueKind.String)
                     {
                         return new LaunchSettingsApplyResult(false, LocalizableStrings.UsableLaunchProfileCannotBeLocated);
                     }
@@ -100,9 +100,9 @@ private static bool TryLocateHandler(string commandName, out ILaunchSettingsProv
 
         private static bool IsDefaultProfileType(JsonProperty profileProperty)
         {
-            if (profileProperty.Value.Type != JsonValueType.Object
+            if (profileProperty.Value.ValueKind != JsonValueKind.Object
                 || !profileProperty.Value.TryGetProperty(CommandNameKey, out var commandNameElement)
-                || commandNameElement.Type != JsonValueType.String)
+                || commandNameElement.ValueKind != JsonValueKind.String)
             {
                 return false;
             }
diff --git a/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs b/src/dotnet/commands/dotnet-run/LaunchSettings/ProjectLaunchSettingsProvider.cs
@@ -54,7 +54,7 @@ public LaunchSettingsApplyResult TryApplySettings(JsonElement model, ref IComman
                 }
                 else if (string.Equals(property.Name, nameof(ProjectLaunchSettingsModel.EnvironmentVariables), StringComparison.OrdinalIgnoreCase))
                 {
-                    if (property.Value.Type != JsonValueType.Object)
+                    if (property.Value.ValueKind != JsonValueKind.Object)
                     {
                         return new LaunchSettingsApplyResult(false, string.Format(LocalizableStrings.ValueMustBeAnObject, property.Name));
                     }
@@ -88,23 +88,23 @@ public LaunchSettingsApplyResult TryApplySettings(JsonElement model, ref IComman
 
         private static bool TryGetBooleanValue(JsonElement element, out bool value)
         {
-            switch (element.Type)
+            switch (element.ValueKind)
             {
-                case JsonValueType.True:
+                case JsonValueKind.True:
                     value = true;
                     return true;
-                case JsonValueType.False:
+                case JsonValueKind.False:
                     value = false;
                     return true;
-                case JsonValueType.Number:
+                case JsonValueKind.Number:
                     if (element.TryGetDouble(out var doubleValue))
                     {
                         value = doubleValue != 0;
                         return true;
                     }
                     value = false;
                     return false;
-                case JsonValueType.String:
+                case JsonValueKind.String:
                     return bool.TryParse(element.GetString(), out value);
                 default:
                     value = false;
@@ -114,21 +114,21 @@ private static bool TryGetBooleanValue(JsonElement element, out bool value)
 
         private static bool TryGetStringValue(JsonElement element, out string value)
         {
-            switch (element.Type)
+            switch (element.ValueKind)
             {
-                case JsonValueType.True:
+                case JsonValueKind.True:
                     value = bool.TrueString;
                     return true;
-                case JsonValueType.False:
+                case JsonValueKind.False:
                     value = bool.FalseString;
                     return true;
-                case JsonValueType.Null:
+                case JsonValueKind.Null:
                     value = string.Empty;
                     return true;
-                case JsonValueType.Number:
+                case JsonValueKind.Number:
                     value = element.GetRawText();
                     return false;
-                case JsonValueType.String:
+                case JsonValueKind.String:
                     value = element.GetString();
                     return true;
                 default:
diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/AppHostShellShimMakerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/AppHostShellShimMakerMock.cs
@@ -26,7 +26,7 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)
 
             _fileSystem.File.WriteAllText(
                 shimPath.Value,
-                JsonSerializer.ToString(shim));
+                JsonSerializer.Serialize(shim));
         }
 
         public class FakeShim
diff --git a/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs b/test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ProjectRestorerMock.cs
@@ -114,7 +114,7 @@ public void Restore(FilePath project,
                 fakeExecutablePath);
             _fileSystem.File.WriteAllText(
                 assetJsonOutput.WithFile(FakeCommandSettingsFileName).Value,
-                JsonSerializer.ToString(new {Name = feedPackage.ToolCommandName}));
+                JsonSerializer.Serialize(new {Name = feedPackage.ToolCommandName}));
         }
 
         public MockFeedPackage GetPackage(
diff --git a/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/test/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs
@@ -84,7 +84,7 @@ public void WhenRunWithPackageIdItShouldCreateValidShim()
 
             // It is hard to simulate shell behavior. Only Assert shim can point to executable dll
             _fileSystem.File.Exists(ExpectedCommandPath()).Should().BeTrue();
-            var deserializedFakeShim = JsonSerializer.Parse<AppHostShellShimMakerMock.FakeShim>(
+            var deserializedFakeShim = JsonSerializer.Deserialize<AppHostShellShimMakerMock.FakeShim>(
                 _fileSystem.File.ReadAllText(ExpectedCommandPath()));
 
             _fileSystem.File.Exists(deserializedFakeShim.ExecutablePath).Should().BeTrue();
@@ -151,7 +151,7 @@ public void WhenRunWithPackageIdWithSourceItShouldCreateValidShim()
             _fileSystem.File.Exists(ExpectedCommandPath())
             .Should().BeTrue();
             var deserializedFakeShim =
-                JsonSerializer.Parse<AppHostShellShimMakerMock.FakeShim>(
+                JsonSerializer.Deserialize<AppHostShellShimMakerMock.FakeShim>(
                     _fileSystem.File.ReadAllText(ExpectedCommandPath()));
             _fileSystem.File.Exists(deserializedFakeShim.ExecutablePath).Should().BeTrue();
         }

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@ internal static bool TryGetStringValue(this JsonElement element, string name, ou`
`15`	`15`	`value = null;`
`16`	`16`	`if (element.TryGetProperty(name, out JsonElement jsonValue))`
`17`	`17`	`{`
`18`		`- if (jsonValue.Type != JsonValueType.String)`
	`18`	`+ if (jsonValue.ValueKind != JsonValueKind.String)`
`19`	`19`	`{`
`20`	`20`	`throw new ToolManifestException(`
`21`	`21`	`string.Format(`
`22`	`22`	`LocalizableStrings.UnexpectedTypeInJson,`
`23`		`- JsonValueType.String.ToString(),`
	`23`	`+ JsonValueKind.String.ToString(),`
`24`	`24`	`name));`
`25`	`25`	`}`
`26`	`26`	`value = jsonValue.GetString();`
`@@ -35,12 +35,12 @@ internal static bool TryGetInt32Value(this JsonElement element, string name, out`
`35`	`35`	`value = default;`
`36`	`36`	`if (element.TryGetProperty(name, out JsonElement jsonValue))`
`37`	`37`	`{`
`38`		`- if (jsonValue.Type != JsonValueType.Number)`
	`38`	`+ if (jsonValue.ValueKind != JsonValueKind.Number)`
`39`	`39`	`{`
`40`	`40`	`throw new ToolManifestException(`
`41`	`41`	`string.Format(`
`42`	`42`	`LocalizableStrings.UnexpectedTypeInJson,`
`43`		`- JsonValueType.Number.ToString(),`
	`43`	`+ JsonValueKind.Number.ToString(),`
`44`	`44`	`name));`
`45`	`45`	`}`
`46`	`46`	`value = jsonValue.GetInt32();`
`@@ -55,12 +55,12 @@ internal static bool TryGetBooleanValue(this JsonElement element, string name, o`
`55`	`55`	`value = default;`
`56`	`56`	`if (element.TryGetProperty(name, out JsonElement jsonValue))`
`57`	`57`	`{`
`58`		`- if (!(jsonValue.Type == JsonValueType.True \|\| jsonValue.Type == JsonValueType.False))`
	`58`	`+ if (!(jsonValue.ValueKind == JsonValueKind.True \|\| jsonValue.ValueKind == JsonValueKind.False))`
`59`	`59`	`{`
`60`	`60`	`throw new ToolManifestException(`
`61`	`61`	`string.Format(`
`62`	`62`	`LocalizableStrings.UnexpectedTypeInJson,`
`63`		`- JsonValueType.True.ToString() + "\|" + JsonValueType.False.ToString(),`
	`63`	`+ JsonValueKind.True.ToString() + "\|" + JsonValueKind.False.ToString(),`
`64`	`64`	`name));`
`65`	`65`	`}`
`66`	`66`	`value = jsonValue.GetBoolean();`
Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,11 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po`
`164`	`164`	`serializableLocalToolsManifest.Tools =`
`165`	`165`	`new List<SerializableLocalToolSinglePackage>();`
`166`	`166`
`167`		`- if (tools.Type != JsonValueType.Object)`
	`167`	`+ if (tools.ValueKind != JsonValueKind.Object)`
`168`	`168`	`{`
`169`	`169`	`throw new ToolManifestException(`
`170`	`170`	`string.Format(LocalizableStrings.UnexpectedTypeInJson,`
`171`		`- JsonValueType.Object.ToString(),`
	`171`	`+ JsonValueKind.Object.ToString(),`
`172`	`172`	`JsonPropertyTools));`
`173`	`173`	`}`
`174`	`174`
`@@ -184,21 +184,21 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po`
`184`	`184`	`var commands = new List<string>();`
`185`	`185`	`if (toolJson.Value.TryGetProperty(JsonPropertyCommands, out var commandsJson))`
`186`	`186`	`{`
`187`		`- if (commandsJson.Type != JsonValueType.Array)`
	`187`	`+ if (commandsJson.ValueKind != JsonValueKind.Array)`
`188`	`188`	`{`
`189`	`189`	`throw new ToolManifestException(`
`190`	`190`	`string.Format(LocalizableStrings.UnexpectedTypeInJson,`
`191`		`- JsonValueType.Array.ToString(),`
	`191`	`+ JsonValueKind.Array.ToString(),`
`192`	`192`	`JsonPropertyCommands));`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`foreach (var command in commandsJson.EnumerateArray())`
`196`	`196`	`{`
`197`		`- if (command.Type != JsonValueType.String)`
	`197`	`+ if (command.ValueKind != JsonValueKind.String)`
`198`	`198`	`{`
`199`	`199`	`throw new ToolManifestException(`
`200`	`200`	`string.Format(LocalizableStrings.UnexpectedTypeInJson,`
`201`		`- JsonValueType.String.ToString(),`
	`201`	`+ JsonValueKind.String.ToString(),`
`202`	`202`	`"command"));`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void Save(`
`51`	`51`
`52`	`52`	`_fileSystem.File.WriteAllText(`
`53`	`53`	`packageCacheFile,`
`54`		`- JsonSerializer.ToString(existingCacheTable.Concat(diffedRow)));`
	`54`	`+ JsonSerializer.Serialize(existingCacheTable.Concat(diffedRow)));`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`@@ -64,7 +64,7 @@ public void Save(`
`64`	`64`
`65`	`65`	`_fileSystem.File.WriteAllText(`
`66`	`66`	`packageCacheFile,`
`67`		`- JsonSerializer.ToString(rowsToAdd));`
	`67`	`+ JsonSerializer.Serialize(rowsToAdd));`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -96,7 +96,7 @@ private CacheRow[] GetCacheTable(string packageCacheFile)`
`96`	`96`	`try`
`97`	`97`	`{`
`98`	`98`	`cacheTable =`
`99`		`- JsonSerializer.Parse<CacheRow[]>(_fileSystem.File.ReadAllText(packageCacheFile));`
	`99`	`+ JsonSerializer.Deserialize<CacheRow[]>(_fileSystem.File.ReadAllText(packageCacheFile));`
`100`	`100`	`}`
`101`	`101`	`catch (JsonException)`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett`
`29`	`29`	`{`
`30`	`30`	`var model = document.RootElement;`
`31`	`31`
`32`		`- if (model.Type != JsonValueType.Object \|\| !model.TryGetProperty(ProfilesKey, out var profilesObject) \|\| profilesObject.Type != JsonValueType.Object)`
	`32`	`+ if (model.ValueKind != JsonValueKind.Object \|\| !model.TryGetProperty(ProfilesKey, out var profilesObject) \|\| profilesObject.ValueKind != JsonValueKind.Object)`
`33`	`33`	`{`
`34`	`34`	`return new LaunchSettingsApplyResult(false, LocalizableStrings.LaunchProfilesCollectionIsNotAJsonObject);`
`35`	`35`	`}`
`@@ -43,19 +43,19 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett`
`43`	`43`	`}`
`44`	`44`	`else`
`45`	`45`	`{`
`46`		`- if (!profilesObject.TryGetProperty(profileName, out profileObject) \|\| profileObject.Type != JsonValueType.Object)`
	`46`	`+ if (!profilesObject.TryGetProperty(profileName, out profileObject) \|\| profileObject.ValueKind != JsonValueKind.Object)`
`47`	`47`	`{`
`48`	`48`	`return new LaunchSettingsApplyResult(false, LocalizableStrings.LaunchProfileIsNotAJsonObject);`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (profileObject.Type == default)`
	`52`	`+ if (profileObject.ValueKind == default)`
`53`	`53`	`{`
`54`	`54`	`foreach (var prop in profilesObject.EnumerateObject())`
`55`	`55`	`{`
`56`		`- if (prop.Value.Type == JsonValueType.Object)`
	`56`	`+ if (prop.Value.ValueKind == JsonValueKind.Object)`
`57`	`57`	`{`
`58`		`- if (prop.Value.TryGetProperty(CommandNameKey, out var commandNameElement) && commandNameElement.Type == JsonValueType.String)`
	`58`	`+ if (prop.Value.TryGetProperty(CommandNameKey, out var commandNameElement) && commandNameElement.ValueKind == JsonValueKind.String)`
`59`	`59`	`{`
`60`	`60`	`if (_providers.ContainsKey(commandNameElement.GetString()))`
`61`	`61`	`{`
`@@ -67,13 +67,13 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`- if (profileObject.Type == default)`
	`70`	`+ if (profileObject.ValueKind == default)`
`71`	`71`	`{`
`72`	`72`	`return new LaunchSettingsApplyResult(false, LocalizableStrings.UsableLaunchProfileCannotBeLocated);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if (!profileObject.TryGetProperty(CommandNameKey, out var finalCommandNameElement)`
`76`		`- \|\| finalCommandNameElement.Type != JsonValueType.String)`
	`76`	`+ \|\| finalCommandNameElement.ValueKind != JsonValueKind.String)`
`77`	`77`	`{`
`78`	`78`	`return new LaunchSettingsApplyResult(false, LocalizableStrings.UsableLaunchProfileCannotBeLocated);`
`79`	`79`	`}`
`@@ -100,9 +100,9 @@ private static bool TryLocateHandler(string commandName, out ILaunchSettingsProv`
`100`	`100`
`101`	`101`	`private static bool IsDefaultProfileType(JsonProperty profileProperty)`
`102`	`102`	`{`
`103`		`- if (profileProperty.Value.Type != JsonValueType.Object`
	`103`	`+ if (profileProperty.Value.ValueKind != JsonValueKind.Object`
`104`	`104`	`\|\| !profileProperty.Value.TryGetProperty(CommandNameKey, out var commandNameElement)`
`105`		`- \|\| commandNameElement.Type != JsonValueType.String)`
	`105`	`+ \|\| commandNameElement.ValueKind != JsonValueKind.String)`
`106`	`106`	`{`
`107`	`107`	`return false;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void CreateApphostShellShim(FilePath entryPoint, FilePath shimPath)`
`26`	`26`
`27`	`27`	`_fileSystem.File.WriteAllText(`
`28`	`28`	`shimPath.Value,`
`29`		`- JsonSerializer.ToString(shim));`
	`29`	`+ JsonSerializer.Serialize(shim));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public class FakeShim`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public void Restore(FilePath project,`
`114`	`114`	`fakeExecutablePath);`
`115`	`115`	`_fileSystem.File.WriteAllText(`
`116`	`116`	`assetJsonOutput.WithFile(FakeCommandSettingsFileName).Value,`
`117`		`- JsonSerializer.ToString(new {Name = feedPackage.ToolCommandName}));`
	`117`	`+ JsonSerializer.Serialize(new {Name = feedPackage.ToolCommandName}));`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`public MockFeedPackage GetPackage(`