Skip to content

Commit 54af0e8

Browse files
JR-MorganJR-Morgan
committed
Drop all the way down to 5.x.x
1 parent 0917e97 commit 54af0e8

9 files changed

Lines changed: 150 additions & 105 deletions

File tree

‎src/Speckle.Automate.Sdk/Speckle.Automate.Sdk.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
<ItemGroup Label="Package References">
1919
<PackageReference Include="Newtonsoft.Json.Schema" />
2020
<PackageReference Include="System.CommandLine" NoWarn="NU5104" />
21+
<!--Overide to match the lowest of the .NET core targets, we don't care about having a huge compatiblity window-->
22+
<PackageReference
23+
Include="System.Text.Json"
24+
OverrideVersion="8.0.6"
25+
Condition=" '$(TargetFramework)' == 'netstandard2.0'"
26+
/>
2127
</ItemGroup>
2228
<ItemGroup Label="Project References">
2329
<ProjectReference Include="..\Speckle.Objects\Speckle.Objects.csproj" />

‎src/Speckle.Automate.Sdk/packages.lock.json‎

Lines changed: 49 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,21 @@
5151
"System.Memory": "4.5.4"
5252
}
5353
},
54+
"System.Text.Json": {
55+
"type": "Direct",
56+
"requested": "[10.0.7, )",
57+
"resolved": "10.0.7",
58+
"contentHash": "F8Pu2QLUMeniVbtiyk7n7LCfFYxlcJ8ASaSwglJyq6dxa34iCQrikQszsgJClIJWuSWjcyhKkV7daAzYJqeVwA==",
59+
"dependencies": {
60+
"Microsoft.Bcl.AsyncInterfaces": "10.0.7",
61+
"System.Buffers": "4.6.1",
62+
"System.IO.Pipelines": "10.0.7",
63+
"System.Memory": "4.6.3",
64+
"System.Runtime.CompilerServices.Unsafe": "6.1.2",
65+
"System.Text.Encodings.Web": "10.0.7",
66+
"System.Threading.Tasks.Extensions": "4.6.3"
67+
}
68+
},
5469
"GraphQL.Client.Abstractions": {
5570
"type": "Transitive",
5671
"resolved": "6.0.0",
@@ -185,28 +200,38 @@
185200
},
186201
"System.Buffers": {
187202
"type": "Transitive",
188-
"resolved": "4.5.1",
189-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
203+
"resolved": "4.6.1",
204+
"contentHash": "N8GXpmiLMtljq7gwvyS+1QvKT/W2J8sNAvx+HVg4NGmsG/H+2k/y9QI23auLJRterrzCiDH+IWAw4V/GPwsMlw=="
190205
},
191206
"System.ComponentModel.Annotations": {
192207
"type": "Transitive",
193208
"resolved": "4.5.0",
194209
"contentHash": "UxYQ3FGUOtzJ7LfSdnYSFd7+oEv6M8NgUatatIN2HxNtDdlcvFAf+VIq4Of9cDMJEJC0aSRv/x898RYhB4Yppg=="
195210
},
211+
"System.IO.Pipelines": {
212+
"type": "Transitive",
213+
"resolved": "10.0.7",
214+
"contentHash": "LTxXYYKmRhPKWveYmfzuRTUnzsfY7CN+WOq6aTRgYE9vJ8BUvIWPCaSx4HxqBwXViTPSjR9cHDOVuVPuZGRR/Q==",
215+
"dependencies": {
216+
"System.Buffers": "4.6.1",
217+
"System.Memory": "4.6.3",
218+
"System.Threading.Tasks.Extensions": "4.6.3"
219+
}
220+
},
196221
"System.Memory": {
197222
"type": "Transitive",
198-
"resolved": "4.5.5",
199-
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
223+
"resolved": "4.6.3",
224+
"contentHash": "qdcDOgnFZY40+Q9876JUHnlHu7bosOHX8XISRoH94fwk6hgaeQGSgfZd8srWRZNt5bV9ZW2TljcegDNxsf+96A==",
200225
"dependencies": {
201-
"System.Buffers": "4.5.1",
202-
"System.Numerics.Vectors": "4.4.0",
203-
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
226+
"System.Buffers": "4.6.1",
227+
"System.Numerics.Vectors": "4.6.1",
228+
"System.Runtime.CompilerServices.Unsafe": "6.1.2"
204229
}
205230
},
206231
"System.Numerics.Vectors": {
207232
"type": "Transitive",
208-
"resolved": "4.5.0",
209-
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
233+
"resolved": "4.6.1",
234+
"contentHash": "sQxefTnhagrhoq2ReR0D/6K0zJcr9Hrd6kikeXsA1I8kOCboTavcUC4r7TSfpKFeE163uMuxZcyfO1mGO3EN8Q=="
210235
},
211236
"System.Reactive": {
212237
"type": "Transitive",
@@ -219,8 +244,8 @@
219244
},
220245
"System.Runtime.CompilerServices.Unsafe": {
221246
"type": "Transitive",
222-
"resolved": "6.0.0",
223-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
247+
"resolved": "6.1.2",
248+
"contentHash": "2hBr6zdbIBTDE3EhK7NSVNdX58uTK6iHW/P/Axmm9sl1xoGSLqDvMtpecn226TNwHByFokYwJmt/aQQNlO5CRw=="
224249
},
225250
"System.Runtime.InteropServices.WindowsRuntime": {
226251
"type": "Transitive",
@@ -229,20 +254,20 @@
229254
},
230255
"System.Text.Encodings.Web": {
231256
"type": "Transitive",
232-
"resolved": "7.0.0",
233-
"contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==",
257+
"resolved": "10.0.7",
258+
"contentHash": "WUH+viO8VDG8NpFKvOBwpeyKUiPOMz3kQpA6AKCD4b2NG1pBhyC4AwTb357iZmTxZDnkM4IsFnvzN8W8OKmsHg==",
234259
"dependencies": {
235-
"System.Buffers": "4.5.1",
236-
"System.Memory": "4.5.5",
237-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
260+
"System.Buffers": "4.6.1",
261+
"System.Memory": "4.6.3",
262+
"System.Runtime.CompilerServices.Unsafe": "6.1.2"
238263
}
239264
},
240265
"System.Threading.Tasks.Extensions": {
241266
"type": "Transitive",
242-
"resolved": "4.5.4",
243-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
267+
"resolved": "4.6.3",
268+
"contentHash": "7sCiwilJLYbTZELaKnc7RecBBXWXA+xMLQWZKWawBxYjp6DBlSE3v9/UcvKBvr1vv2tTOhipiogM8rRmxlhrVA==",
244269
"dependencies": {
245-
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
270+
"System.Runtime.CompilerServices.Unsafe": "6.1.2"
246271
}
247272
},
248273
"speckle.objects": {
@@ -268,7 +293,8 @@
268293
"type": "Project",
269294
"dependencies": {
270295
"Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )",
271-
"System.Text.Json": "[7.0.0, )"
296+
"System.Memory": "[4.5.5, )",
297+
"System.Text.Json": "[5.0.2, )"
272298
}
273299
},
274300
"GraphQL.Client": {
@@ -285,10 +311,10 @@
285311
"Microsoft.Bcl.AsyncInterfaces": {
286312
"type": "CentralTransitive",
287313
"requested": "[9.0.4, )",
288-
"resolved": "9.0.4",
289-
"contentHash": "9VGI5kxIvrNG2mqLQZnUR6y/3fcnygD8eNpHR+CqfbnIXvea6nehnYknDKQTxZVPMpzpNca+7DxLBmpdB3q0Bw==",
314+
"resolved": "10.0.7",
315+
"contentHash": "g0Xp9A+B8jCf5pNIIhFOQXPJkte3D87shfTLY+ylwfSh22U5oQH6tvvmcUuqJvt/wtwKk0WdNp2OGEczHJlJdg==",
290316
"dependencies": {
291-
"System.Threading.Tasks.Extensions": "4.5.4"
317+
"System.Threading.Tasks.Extensions": "4.6.3"
292318
}
293319
},
294320
"Microsoft.CSharp": {
@@ -339,21 +365,6 @@
339365
"requested": "[13.0.2, )",
340366
"resolved": "13.0.2",
341367
"contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
342-
},
343-
"System.Text.Json": {
344-
"type": "CentralTransitive",
345-
"requested": "[10.0.7, )",
346-
"resolved": "7.0.0",
347-
"contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
348-
"dependencies": {
349-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
350-
"System.Buffers": "4.5.1",
351-
"System.Memory": "4.5.5",
352-
"System.Numerics.Vectors": "4.5.0",
353-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
354-
"System.Text.Encodings.Web": "7.0.0",
355-
"System.Threading.Tasks.Extensions": "4.5.4"
356-
}
357368
}
358369
},
359370
"net10.0": {

‎src/Speckle.Objects/packages.lock.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
},
197197
"System.Runtime.CompilerServices.Unsafe": {
198198
"type": "Transitive",
199-
"resolved": "6.0.0",
200-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
199+
"resolved": "5.0.0",
200+
"contentHash": "ZD9TMpsmYJLrxbbmdvhwt9YEgG5WntEnZ/d1eH8JBX9LBp+Ju8BSBhUGbZMNVHHomWo2KVImJhTDl2hIgw/6MA=="
201201
},
202202
"System.Runtime.InteropServices.WindowsRuntime": {
203203
"type": "Transitive",
@@ -206,12 +206,11 @@
206206
},
207207
"System.Text.Encodings.Web": {
208208
"type": "Transitive",
209-
"resolved": "7.0.0",
210-
"contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==",
209+
"resolved": "5.0.1",
210+
"contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
211211
"dependencies": {
212212
"System.Buffers": "4.5.1",
213-
"System.Memory": "4.5.5",
214-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
213+
"System.Memory": "4.5.4"
215214
}
216215
},
217216
"System.Threading.Tasks.Extensions": {
@@ -239,7 +238,8 @@
239238
"type": "Project",
240239
"dependencies": {
241240
"Microsoft.Bcl.AsyncInterfaces": "[9.0.4, )",
242-
"System.Text.Json": "[7.0.0, )"
241+
"System.Memory": "[4.5.5, )",
242+
"System.Text.Json": "[5.0.2, )"
243243
}
244244
},
245245
"GraphQL.Client": {
@@ -314,15 +314,15 @@
314314
"System.Text.Json": {
315315
"type": "CentralTransitive",
316316
"requested": "[10.0.7, )",
317-
"resolved": "7.0.0",
318-
"contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
317+
"resolved": "5.0.2",
318+
"contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
319319
"dependencies": {
320-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
320+
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
321321
"System.Buffers": "4.5.1",
322-
"System.Memory": "4.5.5",
322+
"System.Memory": "4.5.4",
323323
"System.Numerics.Vectors": "4.5.0",
324-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
325-
"System.Text.Encodings.Web": "7.0.0",
324+
"System.Runtime.CompilerServices.Unsafe": "5.0.0",
325+
"System.Text.Encodings.Web": "5.0.1",
326326
"System.Threading.Tasks.Extensions": "4.5.4"
327327
}
328328
}

‎src/Speckle.Sdk.Dependencies/Speckle.Sdk.Dependencies.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@
2727
<PackageReference Include="Polly.Extensions.Http" PrivateAssets="all" />
2828
<PackageReference Include="Open.ChannelExtensions" PrivateAssets="all" />
2929
<PackageReference Include="System.Threading.Channels" PrivateAssets="all" />
30+
<PackageReference Include="System.Memory" VersionOverride="4.5.5" />
3031
</ItemGroup>
3132
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
3233
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
3334
<!--
34-
We build for apps that come with 7.0.0, so this is our minimum
35+
Dynamo plugins for revit use 5.x.x, so this is our minimum
3536
Consuming apps should override this to 8.x.x or greater
3637
-->
37-
<PackageReference Include="System.Text.Json" NoWarn="NU1903" VersionOverride="7.0.0" />
38+
<PackageReference Include="System.Text.Json" NoWarn="NU1903" VersionOverride="5.0.2" />
3839
</ItemGroup>
3940
<Target Name="BeforeILRepackPrepareBuild" BeforeTargets="ILRepackPrepareBuild">
4041
<ItemGroup>

‎src/Speckle.Sdk.Dependencies/packages.lock.json‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,29 @@
8989
"resolved": "0.9.6",
9090
"contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
9191
},
92+
"System.Memory": {
93+
"type": "Direct",
94+
"requested": "[4.5.5, )",
95+
"resolved": "4.5.5",
96+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
97+
"dependencies": {
98+
"System.Buffers": "4.5.1",
99+
"System.Numerics.Vectors": "4.4.0",
100+
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
101+
}
102+
},
92103
"System.Text.Json": {
93104
"type": "Direct",
94-
"requested": "[7.0.0, )",
95-
"resolved": "7.0.0",
96-
"contentHash": "DaGSsVqKsn/ia6RG8frjwmJonfos0srquhw09TlT8KRw5I43E+4gs+/bZj4K0vShJ5H9imCuXupb4RmS+dBy3w==",
105+
"requested": "[5.0.2, )",
106+
"resolved": "5.0.2",
107+
"contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==",
97108
"dependencies": {
98-
"Microsoft.Bcl.AsyncInterfaces": "7.0.0",
109+
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
99110
"System.Buffers": "4.5.1",
100-
"System.Memory": "4.5.5",
111+
"System.Memory": "4.5.4",
101112
"System.Numerics.Vectors": "4.5.0",
102-
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
103-
"System.Text.Encodings.Web": "7.0.0",
113+
"System.Runtime.CompilerServices.Unsafe": "5.0.0",
114+
"System.Text.Encodings.Web": "5.0.1",
104115
"System.Threading.Tasks.Extensions": "4.5.4"
105116
}
106117
},
@@ -148,16 +159,6 @@
148159
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
149160
}
150161
},
151-
"System.Memory": {
152-
"type": "Transitive",
153-
"resolved": "4.5.5",
154-
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
155-
"dependencies": {
156-
"System.Buffers": "4.5.1",
157-
"System.Numerics.Vectors": "4.4.0",
158-
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
159-
}
160-
},
161162
"System.Numerics.Vectors": {
162163
"type": "Transitive",
163164
"resolved": "4.5.0",
@@ -170,12 +171,11 @@
170171
},
171172
"System.Text.Encodings.Web": {
172173
"type": "Transitive",
173-
"resolved": "7.0.0",
174-
"contentHash": "OP6umVGxc0Z0MvZQBVigj4/U31Pw72ITihDWP9WiWDm+q5aoe0GaJivsfYGq53o6dxH7DcXWiCTl7+0o2CGdmg==",
174+
"resolved": "5.0.1",
175+
"contentHash": "KmJ+CJXizDofbq6mpqDoRRLcxgOd2z9X3XoFNULSbvbqVRZkFX3istvr+MUjL6Zw1RT+RNdoI4GYidIINtgvqQ==",
175176
"dependencies": {
176177
"System.Buffers": "4.5.1",
177-
"System.Memory": "4.5.5",
178-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
178+
"System.Memory": "4.5.4"
179179
}
180180
},
181181
"System.Threading.Tasks.Extensions": {
@@ -252,6 +252,12 @@
252252
"resolved": "0.9.6",
253253
"contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
254254
},
255+
"System.Memory": {
256+
"type": "Direct",
257+
"requested": "[4.5.5, )",
258+
"resolved": "4.5.5",
259+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
260+
},
255261
"System.Threading.Channels": {
256262
"type": "Direct",
257263
"requested": "[9.0.4, )",
@@ -339,6 +345,12 @@
339345
"resolved": "0.9.6",
340346
"contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
341347
},
348+
"System.Memory": {
349+
"type": "Direct",
350+
"requested": "[4.5.5, )",
351+
"resolved": "4.5.5",
352+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
353+
},
342354
"System.Threading.Channels": {
343355
"type": "Direct",
344356
"requested": "[9.0.4, )",

‎src/Speckle.Sdk/Pipelines/Send/EfficientJson.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
using System.Buffers;
22
using System.Text;
3+
using System.Text.Json;
34
using Speckle.Sdk.Dependencies;
45

56
namespace Speckle.Sdk.Pipelines.Send;
67

78
public sealed class EfficientJson : IDisposable
89
{
10+
private readonly ArrayBufferWriter<byte> _value;
11+
internal Utf8JsonWriter Writer { get; }
12+
13+
public EfficientJson()
14+
{
15+
_value = Pools.ArrayBufferWriter.Get();
16+
Writer = new(_value);
17+
}
18+
919
internal IBufferWriter<byte> Buffer => _value;
1020

1121
public ReadOnlySpan<byte> WrittenSpan => _value.WrittenSpan;
@@ -24,7 +34,5 @@ public sealed class EfficientJson : IDisposable
2434

2535
public int WrittenCount => _value.WrittenCount;
2636

27-
private readonly ArrayBufferWriter<byte> _value = Pools.ArrayBufferWriter.Get();
28-
2937
public void Dispose() => Pools.ArrayBufferWriter.Return(_value);
3038
}

0 commit comments

Comments
 (0)