Skip to content

Commit 1263f48

Browse files
christophwillechristophwille
authored
Use Microsoft.Sbom.Targets in Decompiler, BamlDecompiler and ILSpyX NuGets (#3346)
https://github.com/microsoft/sbom-tool/tree/main/src/Microsoft.Sbom.Targets to embed SBOM * GeneratePackageOnBuild removed, build action now has a new step for dotnet pack * Decompiler, BamlDecompiler and ILSpyX include SBOM
1 parent 126dffe commit 1263f48

File tree

8 files changed

+47
-3
lines changed

8 files changed

+47
-3
lines changed

‎.github/workflows/build-ilspy.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ jobs:
103103
if: matrix.configuration == 'release'
104104
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net8.0-windows\win-arm64\publish\fwdependent\*
105105

106+
- name: Pack NuGets
107+
if: matrix.configuration == 'release'
108+
run: |
109+
dotnet pack ICSharpCode.Decompiler --no-restore
110+
dotnet pack ICSharpCode.BamlDecompiler --no-restore
111+
dotnet pack ICSharpCode.ILSpyX --no-restore
112+
106113
- name: Build Installer (x64 and arm64, framework-dependent)
107114
if: matrix.configuration == 'release'
108115
run: |

‎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.1" />
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
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

33-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3434
<DebugType>embedded</DebugType>
3535
<DebugSymbols>true</DebugSymbols>
3636
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -67,6 +67,13 @@
6767
$(GetPackageVersionDependsOn)
6868
</GetPackageVersionDependsOn>
6969
</PropertyGroup>
70+
71+
<ItemGroup>
72+
<PackageReference Include="Microsoft.Sbom.Targets">
73+
<PrivateAssets>all</PrivateAssets>
74+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
75+
</PackageReference>
76+
</ItemGroup>
7077

7178
<ItemGroup>
7279
<ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
@@ -75,6 +82,7 @@
7582
<Target Name="ILSpyUpdateAssemblyInfo" AfterTargets="ResolveProjectReferences">
7683
<ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
7784
<Output TaskParameter="Lines" PropertyName="PackageVersion" />
85+
<Output TaskParameter="Lines" PropertyName="SbomGenerationPackageVersion" />
7886
</ReadLinesFromFile>
7987
</Target>
8088

‎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.1, )",
8+
"resolved": "3.0.1",
9+
"contentHash": "/5cyDjX6sDJpgWvMUVwUK7XXa4PIzQWcbUCdsLpAUCqlXRymF0mIMzLVTcAmA55qmTS9cpnjh+28xZD4qKBxQA=="
10+
},
511
"TomsToolbox.Composition.Analyzer": {
612
"type": "Direct",
713
"requested": "[2.21.0, )",

‎ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
2121
<Copyright>Copyright 2011-$([System.DateTime]::Now.Year) AlphaSierraPapa</Copyright>
2222
<PackageTags>C# Decompiler ILSpy</PackageTags>
23+
<GenerateSBOM>true</GenerateSBOM>
2324

2425
<NeutralLanguage>en-US</NeutralLanguage>
2526
<GenerateAssemblyVersionAttribute>False</GenerateAssemblyVersionAttribute>
@@ -34,7 +35,6 @@
3435
<NoWarn>1701;1702;1591;1573</NoWarn>
3536
<WarningsAsErrors>nullable</WarningsAsErrors>
3637

37-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3838
<DebugType>embedded</DebugType>
3939
<DebugSymbols>true</DebugSymbols>
4040
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -80,6 +80,10 @@
8080
</PropertyGroup>
8181

8282
<ItemGroup>
83+
<PackageReference Include="Microsoft.Sbom.Targets" Version="3.0.1">
84+
<PrivateAssets>all</PrivateAssets>
85+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
86+
</PackageReference>
8387
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
8488
<PackageReference Include="System.Reflection.Metadata" Version="6.0.0" />
8589
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
@@ -726,6 +730,7 @@
726730
<WriteLinesToFile Lines="$(CommitHash)" File="@(UpdateAssemblyInfoStamp)" Overwrite="true" Condition="'$(CommitHash)'!='$(LastCommitHash)'" />
727731
<ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
728732
<Output TaskParameter="Lines" PropertyName="PackageVersion" />
733+
<Output TaskParameter="Lines" PropertyName="SbomGenerationPackageVersion" />
729734
</ReadLinesFromFile>
730735
</Target>
731736

‎ICSharpCode.Decompiler/packages.lock.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"version": 1,
33
"dependencies": {
44
".NETStandard,Version=v2.0": {
5+
"Microsoft.Sbom.Targets": {
6+
"type": "Direct",
7+
"requested": "[3.0.1, )",
8+
"resolved": "3.0.1",
9+
"contentHash": "/5cyDjX6sDJpgWvMUVwUK7XXa4PIzQWcbUCdsLpAUCqlXRymF0mIMzLVTcAmA55qmTS9cpnjh+28xZD4qKBxQA=="
10+
},
511
"Microsoft.SourceLink.GitHub": {
612
"type": "Direct",
713
"requested": "[8.0.0, )",

‎ICSharpCode.ILSpyX/ICSharpCode.ILSpyX.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
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

36-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
3737
<DebugType>embedded</DebugType>
3838
<DebugSymbols>true</DebugSymbols>
3939
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -97,6 +97,10 @@
9797
<PrivateAssets>all</PrivateAssets>
9898
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9999
</PackageReference>
100+
<PackageReference Include="Microsoft.Sbom.Targets">
101+
<PrivateAssets>all</PrivateAssets>
102+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
103+
</PackageReference>
100104
</ItemGroup>
101105

102106
<ItemGroup>
@@ -106,6 +110,7 @@
106110
<Target Name="ILSpyUpdateAssemblyInfo" AfterTargets="ResolveProjectReferences">
107111
<ReadLinesFromFile ContinueOnError="true" File="..\VERSION">
108112
<Output TaskParameter="Lines" PropertyName="PackageVersion" />
113+
<Output TaskParameter="Lines" PropertyName="SbomGenerationPackageVersion" />
109114
</ReadLinesFromFile>
110115
</Target>
111116

‎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.1, )",
14+
"resolved": "3.0.1",
15+
"contentHash": "/5cyDjX6sDJpgWvMUVwUK7XXa4PIzQWcbUCdsLpAUCqlXRymF0mIMzLVTcAmA55qmTS9cpnjh+28xZD4qKBxQA=="
16+
},
1117
"Microsoft.SourceLink.GitHub": {
1218
"type": "Direct",
1319
"requested": "[8.0.0, )",

0 commit comments

Comments
 (0)