Skip to content

Commit 90cd265

Browse files
dgrunwalddgrunwald
committed
Update System.Reflection.Metadata dependency to 9.0.0.
Add explicit System.Security.Cryptography.Pkcs dependency to avoid security vulnerability warning in ILSpyCmd. Suppress security vulnerability warnings in test projects.
1 parent 2ca6e22 commit 90cd265

File tree

10 files changed

+39
-81
lines changed

10 files changed

+39
-81
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.0-preview.6.25358.103" />
4545
<PackageVersion Include="System.Resources.Extensions" Version="10.0.0-preview.6.25358.103" />
4646
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
47+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
4748
<PackageVersion Include="TomsToolbox.Composition.MicrosoftExtensions" Version="2.22.1" />
4849
<PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.22.0" />
4950
<PackageVersion Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.22.1" />

‎ICSharpCode.BamlDecompiler/packages.lock.json‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,21 @@
1717
"icsharpcode.decompiler": {
1818
"type": "Project",
1919
"dependencies": {
20-
"System.Collections.Immutable": "[6.0.0, )",
21-
"System.Reflection.Metadata": "[6.0.0, )"
20+
"System.Collections.Immutable": "[9.0.0, )",
21+
"System.Reflection.Metadata": "[9.0.0, )"
2222
}
2323
},
2424
"System.Collections.Immutable": {
2525
"type": "CentralTransitive",
2626
"requested": "[10.0.0-preview.6.25358.103, )",
27-
"resolved": "6.0.0",
28-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
29-
"dependencies": {
30-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
31-
}
27+
"resolved": "9.0.0",
28+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
3229
},
3330
"System.Reflection.Metadata": {
3431
"type": "CentralTransitive",
3532
"requested": "[10.0.0-preview.6.25358.103, )",
36-
"resolved": "6.0.0",
37-
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
38-
"dependencies": {
39-
"System.Collections.Immutable": "6.0.0"
40-
}
41-
},
42-
"System.Runtime.CompilerServices.Unsafe": {
43-
"type": "CentralTransitive",
44-
"requested": "[6.1.2, )",
45-
"resolved": "6.0.0",
46-
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
33+
"resolved": "9.0.0",
34+
"contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ=="
4735
}
4836
}
4937
}

‎ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
2222

23-
<NoWarn>$(NoWarn);1701;1702;1705,67,169,1058,728,1720,649,168,251,660,661,675;1998;162;8632;626;8618;8714;8602;8981</NoWarn>
23+
<!-- NU1902/1903 are "Package 'X' has a known security vulnerability". In our tests, we don't care. -->
24+
<NoWarn>$(NoWarn);1701;1702;1705,67,169,1058,728,1720,649,168,251,660,661,675;1998;162;8632;626;8618;8714;8602;8981;NU1902;NU1903</NoWarn>
2425
<DefineConstants>ROSLYN;ROSLYN2;ROSLYN3;ROSLYN4;NET60;CS60;CS70;CS71;CS72;CS73;CS80;CS90;CS100;CS110;CS120;CS130</DefineConstants>
2526

2627
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>

‎ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<PrivateAssets>all</PrivateAssets>
8585
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8686
</PackageReference>
87-
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
88-
<PackageReference Include="System.Reflection.Metadata" Version="6.0.0" />
87+
<PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
88+
<PackageReference Include="System.Reflection.Metadata" Version="9.0.0" />
8989
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
9090
<PrivateAssets>all</PrivateAssets>
9191
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎ICSharpCode.Decompiler/packages.lock.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,22 @@
2929
},
3030
"System.Collections.Immutable": {
3131
"type": "Direct",
32-
"requested": "[6.0.0, )",
33-
"resolved": "6.0.0",
34-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
32+
"requested": "[9.0.0, )",
33+
"resolved": "9.0.0",
34+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w==",
3535
"dependencies": {
36-
"System.Memory": "4.5.4",
36+
"System.Memory": "4.5.5",
3737
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
3838
}
3939
},
4040
"System.Reflection.Metadata": {
4141
"type": "Direct",
42-
"requested": "[6.0.0, )",
43-
"resolved": "6.0.0",
44-
"contentHash": "sffDOcex1C3HO5kDolOYcWXTwRpZY/LvJujM6SMjn63fWMJWchYAAmkoAJXlbpZ5yf4d+KMgxd+LeETa4gD9sQ==",
42+
"requested": "[9.0.0, )",
43+
"resolved": "9.0.0",
44+
"contentHash": "ANiqLu3DxW9kol/hMmTWbt3414t9ftdIuiIU7j80okq2YzAueo120M442xk1kDJWtmZTqWQn7wHDvMRipVOEOQ==",
4545
"dependencies": {
46-
"System.Collections.Immutable": "6.0.0"
46+
"System.Collections.Immutable": "9.0.0",
47+
"System.Memory": "4.5.5"
4748
}
4849
},
4950
"TunnelVisionLabs.ReferenceAssemblyAnnotator": {
@@ -74,8 +75,8 @@
7475
},
7576
"System.Memory": {
7677
"type": "Transitive",
77-
"resolved": "4.5.4",
78-
"contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
78+
"resolved": "4.5.5",
79+
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
7980
"dependencies": {
8081
"System.Buffers": "4.5.1",
8182
"System.Numerics.Vectors": "4.4.0",

‎ICSharpCode.ILSpyCmd/ICSharpCode.ILSpyCmd.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<PackageReference Include="McMaster.Extensions.Hosting.CommandLine" />
6363
<PackageReference Include="Microsoft.Extensions.Hosting" />
6464
<PackageReference Include="NuGet.Protocol" />
65+
<PackageReference Include="System.Security.Cryptography.Pkcs" />
6566
</ItemGroup>
6667

6768
<Target Name="ILSpyUpdateAssemblyInfo" AfterTargets="ResolveProjectReferences">

‎ICSharpCode.ILSpyCmd/packages.lock.json‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
"NuGet.Packaging": "6.14.0"
5353
}
5454
},
55+
"System.Security.Cryptography.Pkcs": {
56+
"type": "Direct",
57+
"requested": "[9.0.7, )",
58+
"resolved": "9.0.7",
59+
"contentHash": "6LROjtkO4UCv0MVnnR8Z6FwnRryT+Sz5dz8ZefZG6/yz1kQGaVUd6gAdXZtqNPORQwuXFrNGTWvi7f8hWRkiyg=="
60+
},
5561
"TomsToolbox.Composition.Analyzer": {
5662
"type": "Direct",
5763
"requested": "[2.22.1, )",
@@ -336,19 +342,6 @@
336342
"resolved": "10.0.0-preview.6.25358.103",
337343
"contentHash": "JNwN+0tuqtHnELPl7P2T/OjWlgCdqB9fNuwAOh46W7t/2Z5HU+1ROqkiJCupwSVrXjSfV46lcas6HqhUC8BpYQ=="
338344
},
339-
"System.Formats.Asn1": {
340-
"type": "Transitive",
341-
"resolved": "6.0.0",
342-
"contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA=="
343-
},
344-
"System.Security.Cryptography.Pkcs": {
345-
"type": "Transitive",
346-
"resolved": "6.0.4",
347-
"contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==",
348-
"dependencies": {
349-
"System.Formats.Asn1": "6.0.0"
350-
}
351-
},
352345
"System.Security.Cryptography.ProtectedData": {
353346
"type": "Transitive",
354347
"resolved": "4.4.0",
@@ -357,8 +350,8 @@
357350
"icsharpcode.decompiler": {
358351
"type": "Project",
359352
"dependencies": {
360-
"System.Collections.Immutable": "[6.0.0, )",
361-
"System.Reflection.Metadata": "[6.0.0, )"
353+
"System.Collections.Immutable": "[9.0.0, )",
354+
"System.Reflection.Metadata": "[9.0.0, )"
362355
}
363356
},
364357
"icsharpcode.ilspyx": {
@@ -424,8 +417,8 @@
424417
"System.Collections.Immutable": {
425418
"type": "CentralTransitive",
426419
"requested": "[10.0.0-preview.6.25358.103, )",
427-
"resolved": "8.0.0",
428-
"contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg=="
420+
"resolved": "9.0.0",
421+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
429422
},
430423
"System.Composition.AttributedModel": {
431424
"type": "CentralTransitive",

‎ICSharpCode.ILSpyX/packages.lock.json‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,15 @@
6767
"icsharpcode.decompiler": {
6868
"type": "Project",
6969
"dependencies": {
70-
"System.Collections.Immutable": "[6.0.0, )",
71-
"System.Reflection.Metadata": "[6.0.0, )"
70+
"System.Collections.Immutable": "[9.0.0, )",
71+
"System.Reflection.Metadata": "[9.0.0, )"
7272
}
7373
},
7474
"System.Collections.Immutable": {
7575
"type": "CentralTransitive",
7676
"requested": "[10.0.0-preview.6.25358.103, )",
77-
"resolved": "6.0.0",
78-
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
79-
"dependencies": {
80-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
81-
}
77+
"resolved": "9.0.0",
78+
"contentHash": "QhkXUl2gNrQtvPmtBTQHb0YsUrDiDQ2QS09YbtTTiSjGcf7NBqtYbrG/BE06zcBPCKEwQGzIv13IVdXNOSub2w=="
8279
}
8380
}
8481
}

‎debugbuild.bat‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
@setlocal enabledelayedexpansion
2-
@set MSBUILD=
3-
@for /D %%M in ("%ProgramFiles%\Microsoft Visual Studio\2022"\*) do @(
4-
@if exist "%%M\MSBuild\Current\Bin\MSBuild.exe" (
5-
@set "MSBUILD=%%M\MSBuild\Current\Bin\MSBuild.exe"
6-
)
7-
)
8-
@if "%MSBUILD%" == "" (
9-
@echo Could not find VS2022 MSBuild
10-
@exit /b 1
11-
)
12-
@nuget restore ILSpy.sln || (pause && exit /b 1)
13-
"%MSBUILD%" ILSpy.sln /p:Configuration=Debug "/p:Platform=Any CPU" || (pause && exit /b 1)
1+
dotnet build ILSpy.sln /p:Configuration=Debug "/p:Platform=Any CPU" %* || (pause && exit /b 1)

‎releasebuild.bat‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
@setlocal enabledelayedexpansion
2-
@set MSBUILD=
3-
@for /D %%M in ("%ProgramFiles%\Microsoft Visual Studio\2022"\*) do @(
4-
@if exist "%%M\MSBuild\Current\Bin\MSBuild.exe" (
5-
@set "MSBUILD=%%M\MSBuild\Current\Bin\MSBuild.exe"
6-
)
7-
)
8-
@if "%MSBUILD%" == "" (
9-
@echo Could not find VS2022 MSBuild
10-
@exit /b 1
11-
)
12-
@nuget restore ILSpy.sln || (pause && exit /b 1)
13-
"%MSBUILD%" ILSpy.sln /p:Configuration=Release "/p:Platform=Any CPU" || (pause && exit /b 1)
1+
dotnet build ILSpy.sln /p:Configuration=Release "/p:Platform=Any CPU" %* || (pause && exit /b 1)

0 commit comments

Comments
 (0)