Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 1183aea

Browse files
author
William Li
committed
Update stage 0 and adjust to s.t.json api
1 parent 0d5ceb6 commit 1183aea

File tree

4 files changed

+8
-189
lines changed

4 files changed

+8
-189
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313
<!-- Production Dependencies -->
1414
<PropertyGroup>
15-
<DotNetCoreSdkLKGVersion>3.0.100-preview5-011317</DotNetCoreSdkLKGVersion>
15+
<DotNetCoreSdkLKGVersion>3.0.100-preview5-011462</DotNetCoreSdkLKGVersion>
1616
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>2.2.0</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
1717
<MicrosoftNETCoreDotNetHostResolverPackageVersion>2.2.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
1818
<MicrosoftApplicationInsightsPackageVersion>2.0.0</MicrosoftApplicationInsightsPackageVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "3.0.100-preview5-011317"
3+
"dotnet": "3.0.100-preview5-011462"
44
},
55
"msbuild-sdks": {
66
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19218.1"

src/dotnet/ToolManifest/ArrayBufferWriter.cs

Lines changed: 0 additions & 182 deletions
This file was deleted.

src/dotnet/ToolManifest/ToolManifestEditor.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using NuGet.Versioning;
1616
using System.Text.Json;
1717
using System.Text;
18+
using System.Buffers;
1819

1920
namespace Microsoft.DotNet.ToolManifest
2021
{
@@ -75,7 +76,8 @@ public void Add(
7576

7677
deserializedManifest.Tools.Add(
7778
new SerializableLocalToolSinglePackage
78-
{ PackageId = packageId.ToString(),
79+
{
80+
PackageId = packageId.ToString(),
7981
Version = nuGetVersion.ToNormalizedString(),
8082
Commands = toolCommandNames.Select(c => c.Value).ToArray()
8183
});
@@ -359,10 +361,9 @@ private class SerializableLocalToolsManifest
359361

360362
public string ToJson()
361363
{
362-
var state = new JsonWriterState(options: new JsonWriterOptions { Indented = true });
363-
using (var arrayBufferWriter = new ArrayBufferWriter<byte>())
364+
var arrayBufferWriter = new ArrayBufferWriter<byte>();
365+
using (var writer = new Utf8JsonWriter(arrayBufferWriter, new JsonWriterOptions { Indented = true }))
364366
{
365-
var writer = new Utf8JsonWriter(arrayBufferWriter, state);
366367

367368
writer.WriteStartObject();
368369

@@ -394,7 +395,7 @@ public string ToJson()
394395

395396
writer.WriteEndObject();
396397
writer.WriteEndObject();
397-
writer.Flush(true);
398+
writer.Flush();
398399

399400
return Encoding.UTF8.GetString(arrayBufferWriter.WrittenMemory.ToArray());
400401
}

0 commit comments

Comments
 (0)