Skip to content

Commit 49fa5d6

Browse files
Explicit Version tag needed even with CPM, otherwise "ICSharpCode.Decompiler.csproj : warning NU1604: Project dependency Microsoft.Sbom.Targets does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results."
1 parent 0865f46 commit 49fa5d6

File tree

5 files changed

+28
-0
lines changed

5 files changed

+28
-0
lines changed

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2929
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="9.0.0" />
3030
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="9.0.0" />
31+
<PackageVersion Include="Microsoft.Sbom.Targets" Version="3.0.0" />
3132
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3233
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
3334
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />

ICSharpCode.BamlDecompiler/ICSharpCode.BamlDecompiler.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
3030
<Copyright>Copyright 2024-$([System.DateTime]::Now.Year) AlphaSierraPapa</Copyright>
3131
<PackageTags>C# Decompiler ILSpy</PackageTags>
32+
<GenerateSBOM>true</GenerateSBOM>
3233

3334
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3435
<DebugType>embedded</DebugType>
@@ -67,6 +68,13 @@
6768
$(GetPackageVersionDependsOn)
6869
</GetPackageVersionDependsOn>
6970
</PropertyGroup>
71+
72+
<ItemGroup>
73+
<PackageReference Include="Microsoft.Sbom.Targets" Version="3.0.0">
74+
<PrivateAssets>all</PrivateAssets>
75+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
76+
</PackageReference>
77+
</ItemGroup>
7078

7179
<ItemGroup>
7280
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
@@ -75,6 +83,7 @@
7583
<Target Name="ILSpyUpdateAssemblyInfo" AfterTargets="ResolveProjectReferences">
7684
<ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
7785
<Output TaskParameter="Lines" PropertyName="PackageVersion" />
86+
<Output TaskParameter="Lines" PropertyName="SbomGenerationPackageVersion" />
7887
</ReadLinesFromFile>
7988
</Target>
8089

ICSharpCode.BamlDecompiler/packages.lock.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"version": 2,
33
"dependencies": {
44
"net8.0": {
5+
"Microsoft.Sbom.Targets": {
6+
"type": "Direct",
7+
"requested": "[3.0.0, )",
8+
"resolved": "3.0.0",
9+
"contentHash": "YRf+19P0HJoKbCj7lw+KrAk7TE6tTppq1phgWfEx4634N/xTNUM+roV97APGZOqbus5mtwzXdDSvj6KCQsJttA=="
10+
},
511
"TomsToolbox.Composition.Analyzer": {
612
"type": "Direct",
713
"requested": "[2.21.0, )",

ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
3333
<Copyright>Copyright 2022-$([System.DateTime]::Now.Year) AlphaSierraPapa</Copyright>
3434
<PackageTags>C# Decompiler ILSpy</PackageTags>
35+
<GenerateSBOM>true</GenerateSBOM>
3536

3637
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3738
<DebugType>embedded</DebugType>
@@ -97,6 +98,10 @@
9798
<PrivateAssets>all</PrivateAssets>
9899
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
99100
</PackageReference>
101+
<PackageReference Include="Microsoft.Sbom.Targets" Version="3.0.0">
102+
<PrivateAssets>all</PrivateAssets>
103+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
104+
</PackageReference>
100105
</ItemGroup>
101106

102107
<ItemGroup>
@@ -106,6 +111,7 @@
106111
<Target Name="ILSpyUpdateAssemblyInfo" AfterTargets="ResolveProjectReferences">
107112
<ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
108113
<Output TaskParameter="Lines" PropertyName="PackageVersion" />
114+
<Output TaskParameter="Lines" PropertyName="SbomGenerationPackageVersion" />
109115
</ReadLinesFromFile>
110116
</Target>
111117

ICSharpCode.ILSpyX/packages.lock.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
"resolved": "1.3.8",
99
"contentHash": "LhwlPa7c1zs1OV2XadMtAWdImjLIsqFJPoRcIWAadSRn0Ri1DepK65UbWLPmt4riLqx2d40xjXRk0ogpqNtK7g=="
1010
},
11+
"Microsoft.Sbom.Targets": {
12+
"type": "Direct",
13+
"requested": "[3.0.0, )",
14+
"resolved": "3.0.0",
15+
"contentHash": "YRf+19P0HJoKbCj7lw+KrAk7TE6tTppq1phgWfEx4634N/xTNUM+roV97APGZOqbus5mtwzXdDSvj6KCQsJttA=="
16+
},
1117
"Microsoft.SourceLink.GitHub": {
1218
"type": "Direct",
1319
"requested": "[8.0.0, )",

0 commit comments

Comments
 (0)