Skip to content

Commit 871009e

Browse files
authored
Merge pull request #947 from adamhathcock/adam/update-deps
Update dependencies and csharpier
2 parents 9d332b4 + 89a565c commit 871009e

File tree

10 files changed

+2800
-2781
lines changed

10 files changed

+2800
-2781
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"csharpier": {
6-
"version": "1.0.2",
6+
"version": "1.1.2",
77
"commands": [
88
"csharpier"
99
],

Directory.Packages.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<ItemGroup>
33
<PackageVersion Include="Bullseye" Version="6.0.0" />
4-
<PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
4+
<PackageVersion Include="AwesomeAssertions" Version="9.2.0" />
55
<PackageVersion Include="Glob" Version="1.1.9" />
66
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
77
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
@@ -11,9 +11,10 @@
1111
<PackageVersion Include="System.Memory" Version="4.6.0" />
1212
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
1313
<PackageVersion Include="xunit" Version="2.9.3" />
14-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
14+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
1515
<PackageVersion Include="xunit.SkippableFact" Version="1.5.23" />
16-
<PackageVersion Include="ZstdSharp.Port" Version="0.8.5" />
17-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
16+
<PackageVersion Include="ZstdSharp.Port" Version="0.8.6" />
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
1819
</ItemGroup>
1920
</Project>

build/packages.lock.json

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,11 @@
1414
"resolved": "1.1.9",
1515
"contentHash": "AfK5+ECWYTP7G3AAdnU8IfVj+QpGjrh9GC2mpdcJzCvtQ4pnerAGwHsxJ9D4/RnhDUz2DSzd951O/lQjQby2Sw=="
1616
},
17-
"Microsoft.SourceLink.GitHub": {
18-
"type": "Direct",
19-
"requested": "[8.0.0, )",
20-
"resolved": "8.0.0",
21-
"contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
22-
"dependencies": {
23-
"Microsoft.Build.Tasks.Git": "8.0.0",
24-
"Microsoft.SourceLink.Common": "8.0.0"
25-
}
26-
},
2717
"SimpleExec": {
2818
"type": "Direct",
2919
"requested": "[12.0.0, )",
3020
"resolved": "12.0.0",
3121
"contentHash": "ptxlWtxC8vM6Y6e3h9ZTxBBkOWnWrm/Sa1HT+2i1xcXY3Hx2hmKDZP5RShPf8Xr9D+ivlrXNy57ktzyH8kyt+Q=="
32-
},
33-
"Microsoft.Build.Tasks.Git": {
34-
"type": "Transitive",
35-
"resolved": "8.0.0",
36-
"contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
37-
},
38-
"Microsoft.SourceLink.Common": {
39-
"type": "Transitive",
40-
"resolved": "8.0.0",
41-
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
4222
}
4323
}
4424
}

src/SharpCompress/SharpCompress.csproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,14 @@
3131
<PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
3232
<IsTrimmable>true</IsTrimmable>
3333
</PropertyGroup>
34-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'" />
35-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net48|AnyCPU'" />
36-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net481|AnyCPU'" />
37-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'" />
38-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'" />
3934
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
4035
<DefineConstants>$(DefineConstants);DEBUG_STREAMS</DefineConstants>
4136
</PropertyGroup>
42-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net48|AnyCPU'" />
43-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net481|AnyCPU'" />
44-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'" />
45-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'" />
4637
<ItemGroup>
4738
<PackageReference Include="System.Buffers" />
4839
<PackageReference Include="ZstdSharp.Port" />
40+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
41+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
4942
</ItemGroup>
5043
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
5144
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />

src/SharpCompress/packages.lock.json

Lines changed: 75 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22
"version": 2,
33
"dependencies": {
44
".NETFramework,Version=v4.8": {
5+
"Microsoft.NETFramework.ReferenceAssemblies": {
6+
"type": "Direct",
7+
"requested": "[1.0.3, )",
8+
"resolved": "1.0.3",
9+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
10+
"dependencies": {
11+
"Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3"
12+
}
13+
},
514
"Microsoft.SourceLink.GitHub": {
615
"type": "Direct",
716
"requested": "[8.0.0, )",
@@ -20,9 +29,9 @@
2029
},
2130
"ZstdSharp.Port": {
2231
"type": "Direct",
23-
"requested": "[0.8.5, )",
24-
"resolved": "0.8.5",
25-
"contentHash": "TR4j17WeVSEb3ncgL2NqlXEqcy04I+Kk9CaebNDplUeL8XOgjkZ7fP4Wg4grBdPLIqsV86p2QaXTkZoRMVOsew==",
32+
"requested": "[0.8.6, )",
33+
"resolved": "0.8.6",
34+
"contentHash": "iP4jVLQoQmUjMU88g1WObiNr6YKZGvh4aOXn3yOJsHqZsflwRsxZPcIBvNXgjXO3vQKSLctXGLTpcBPLnWPS8A==",
2635
"dependencies": {
2736
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
2837
"System.Memory": "4.5.5",
@@ -34,6 +43,11 @@
3443
"resolved": "8.0.0",
3544
"contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
3645
},
46+
"Microsoft.NETFramework.ReferenceAssemblies.net48": {
47+
"type": "Transitive",
48+
"resolved": "1.0.3",
49+
"contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
50+
},
3751
"Microsoft.SourceLink.Common": {
3852
"type": "Transitive",
3953
"resolved": "8.0.0",
@@ -106,9 +120,9 @@
106120
},
107121
"ZstdSharp.Port": {
108122
"type": "Direct",
109-
"requested": "[0.8.5, )",
110-
"resolved": "0.8.5",
111-
"contentHash": "TR4j17WeVSEb3ncgL2NqlXEqcy04I+Kk9CaebNDplUeL8XOgjkZ7fP4Wg4grBdPLIqsV86p2QaXTkZoRMVOsew==",
123+
"requested": "[0.8.6, )",
124+
"resolved": "0.8.6",
125+
"contentHash": "iP4jVLQoQmUjMU88g1WObiNr6YKZGvh4aOXn3yOJsHqZsflwRsxZPcIBvNXgjXO3vQKSLctXGLTpcBPLnWPS8A==",
112126
"dependencies": {
113127
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
114128
"System.Memory": "4.5.5",
@@ -179,6 +193,15 @@
179193
"System.Threading.Tasks.Extensions": "4.5.4"
180194
}
181195
},
196+
"Microsoft.NETFramework.ReferenceAssemblies": {
197+
"type": "Direct",
198+
"requested": "[1.0.3, )",
199+
"resolved": "1.0.3",
200+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
201+
"dependencies": {
202+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
203+
}
204+
},
182205
"Microsoft.SourceLink.GitHub": {
183206
"type": "Direct",
184207
"requested": "[8.0.0, )",
@@ -227,9 +250,9 @@
227250
},
228251
"ZstdSharp.Port": {
229252
"type": "Direct",
230-
"requested": "[0.8.5, )",
231-
"resolved": "0.8.5",
232-
"contentHash": "TR4j17WeVSEb3ncgL2NqlXEqcy04I+Kk9CaebNDplUeL8XOgjkZ7fP4Wg4grBdPLIqsV86p2QaXTkZoRMVOsew==",
253+
"requested": "[0.8.6, )",
254+
"resolved": "0.8.6",
255+
"contentHash": "iP4jVLQoQmUjMU88g1WObiNr6YKZGvh4aOXn3yOJsHqZsflwRsxZPcIBvNXgjXO3vQKSLctXGLTpcBPLnWPS8A==",
233256
"dependencies": {
234257
"Microsoft.Bcl.AsyncInterfaces": "5.0.0",
235258
"System.Memory": "4.5.5",
@@ -246,6 +269,11 @@
246269
"resolved": "1.1.0",
247270
"contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
248271
},
272+
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
273+
"type": "Transitive",
274+
"resolved": "1.0.3",
275+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
276+
},
249277
"Microsoft.SourceLink.Common": {
250278
"type": "Transitive",
251279
"resolved": "8.0.0",
@@ -271,6 +299,15 @@
271299
}
272300
},
273301
"net6.0": {
302+
"Microsoft.NETFramework.ReferenceAssemblies": {
303+
"type": "Direct",
304+
"requested": "[1.0.3, )",
305+
"resolved": "1.0.3",
306+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
307+
"dependencies": {
308+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
309+
}
310+
},
274311
"Microsoft.SourceLink.GitHub": {
275312
"type": "Direct",
276313
"requested": "[8.0.0, )",
@@ -289,15 +326,20 @@
289326
},
290327
"ZstdSharp.Port": {
291328
"type": "Direct",
292-
"requested": "[0.8.5, )",
293-
"resolved": "0.8.5",
294-
"contentHash": "TR4j17WeVSEb3ncgL2NqlXEqcy04I+Kk9CaebNDplUeL8XOgjkZ7fP4Wg4grBdPLIqsV86p2QaXTkZoRMVOsew=="
329+
"requested": "[0.8.6, )",
330+
"resolved": "0.8.6",
331+
"contentHash": "iP4jVLQoQmUjMU88g1WObiNr6YKZGvh4aOXn3yOJsHqZsflwRsxZPcIBvNXgjXO3vQKSLctXGLTpcBPLnWPS8A=="
295332
},
296333
"Microsoft.Build.Tasks.Git": {
297334
"type": "Transitive",
298335
"resolved": "8.0.0",
299336
"contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
300337
},
338+
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
339+
"type": "Transitive",
340+
"resolved": "1.0.3",
341+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
342+
},
301343
"Microsoft.SourceLink.Common": {
302344
"type": "Transitive",
303345
"resolved": "8.0.0",
@@ -307,9 +349,18 @@
307349
"net8.0": {
308350
"Microsoft.NET.ILLink.Tasks": {
309351
"type": "Direct",
310-
"requested": "[8.0.18, )",
311-
"resolved": "8.0.18",
312-
"contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA=="
352+
"requested": "[8.0.17, )",
353+
"resolved": "8.0.17",
354+
"contentHash": "x5/y4l8AtshpBOrCZdlE4txw8K3e3s9meBFeZeR3l8hbbku2V7kK6ojhXvrbjg1rk3G+JqL1BI26gtgc1ZrdUw=="
355+
},
356+
"Microsoft.NETFramework.ReferenceAssemblies": {
357+
"type": "Direct",
358+
"requested": "[1.0.3, )",
359+
"resolved": "1.0.3",
360+
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
361+
"dependencies": {
362+
"Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
363+
}
313364
},
314365
"Microsoft.SourceLink.GitHub": {
315366
"type": "Direct",
@@ -329,20 +380,25 @@
329380
},
330381
"ZstdSharp.Port": {
331382
"type": "Direct",
332-
"requested": "[0.8.5, )",
333-
"resolved": "0.8.5",
334-
"contentHash": "TR4j17WeVSEb3ncgL2NqlXEqcy04I+Kk9CaebNDplUeL8XOgjkZ7fP4Wg4grBdPLIqsV86p2QaXTkZoRMVOsew=="
383+
"requested": "[0.8.6, )",
384+
"resolved": "0.8.6",
385+
"contentHash": "iP4jVLQoQmUjMU88g1WObiNr6YKZGvh4aOXn3yOJsHqZsflwRsxZPcIBvNXgjXO3vQKSLctXGLTpcBPLnWPS8A=="
335386
},
336387
"Microsoft.Build.Tasks.Git": {
337388
"type": "Transitive",
338389
"resolved": "8.0.0",
339390
"contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
340391
},
392+
"Microsoft.NETFramework.ReferenceAssemblies.net461": {
393+
"type": "Transitive",
394+
"resolved": "1.0.3",
395+
"contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
396+
},
341397
"Microsoft.SourceLink.Common": {
342398
"type": "Transitive",
343399
"resolved": "8.0.0",
344400
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
345401
}
346402
}
347403
}
348-
}
404+
}

0 commit comments

Comments
 (0)