Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/build-ilspy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,16 @@ jobs:
7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip '-xr!*.pdb'
.\ILSpy\bin\Release\net10.0\win-arm64\publish\fwdependent\*

# The persistent MSBuild server (on by default since .NET SDK 11.0.100-preview.7,
# dotnet/sdk#55231) breaks the SBOM generation Microsoft.Sbom.Targets runs inside
# pack: sbom-tool's console backend caches the server's redirected console writer
# from the first pack, so the later packs in the reused server process fail their
# component-detection scan with ObjectDisposedException and emit SBOMs with zero
# packages. Opt out so each pack runs in a fresh single-shot MSBuild process.
- name: Pack NuGets
if: matrix.configuration == 'release'
env:
DOTNET_CLI_USE_MSBUILD_SERVER: 'false'
run: |
dotnet pack ICSharpCode.Decompiler --no-restore
dotnet pack ICSharpCode.BamlDecompiler --no-restore
Expand Down
16 changes: 8 additions & 8 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<PropertyGroup>
<RoslynVersion>5.9.0-1.26359.118</RoslynVersion>
<NetPackageVersion>10.0.10</NetPackageVersion>
<RoslynVersion>5.10.0-1.26381.103</RoslynVersion>
<NetPackageVersion>10.0.11</NetPackageVersion>
<TomsToolboxVersion>2.24.0</TomsToolboxVersion>
<AvaloniaVersion>12.1.1</AvaloniaVersion>
<DockVersion>12.1.0</DockVersion>
<DockVersion>12.1.0.1</DockVersion>
</PropertyGroup>
<ItemGroup>
<!-- Avalonia (ILSpy port) -->
Expand All @@ -30,7 +30,7 @@
<PackageVersion Include="Dock.Controls.Recycling" Version="$(DockVersion)" />
<PackageVersion Include="Dock.Model.Mvvm" Version="$(DockVersion)" />
<PackageVersion Include="Dock.Serializer.SystemTextJson" Version="$(DockVersion)" />
<PackageVersion Include="ProDataGrid" Version="12.0.4" />
<PackageVersion Include="ProDataGrid" Version="12.1.0.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="AwesomeAssertions" Version="9.5.0" />
<PackageVersion Include="CliWrap" Version="3.10.4" />
Expand Down Expand Up @@ -60,15 +60,15 @@
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="$(NetPackageVersion)" />
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="$(NetPackageVersion)" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.5" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.301" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.400" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.3.3" />
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="NSubstitute" Version="6.0.0" />
<PackageVersion Include="NSubstitute" Version="6.2.0" />
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageVersion Include="NuGet.Frameworks" Version="7.6.0" />
<PackageVersion Include="NuGet.Protocol" Version="7.6.0" />
<PackageVersion Include="NuGet.Frameworks" Version="7.9.0" />
<PackageVersion Include="NuGet.Protocol" Version="7.9.0" />
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageVersion Include="System.Composition.AttributedModel" Version="$(NetPackageVersion)" />
<PackageVersion Include="System.Composition.Hosting" Version="$(NetPackageVersion)" />
Expand Down
12 changes: 6 additions & 6 deletions ICSharpCode.BamlDecompiler/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "Ih5zrydoDc1H5I0eNP6f4Lzw3cjsPMN4Nikd86kbyi66y0flkM9GfjVo62aUbcxeTbypzBCFAFQ+/6RF2jRORg=="
"requested": "[10.0.11, )",
"resolved": "10.0.11",
"contentHash": "BQY956wwWSjRDoOspL6L1JscbFoSgJK606mO3PYalBHIZRV+Sc2xokvR/NHLlpUEfju6EbW5GbKbNpVYQ65cLw=="
},
"System.Reflection.Metadata": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "NZIS6/IUBh70nJfVvE577oDc81y5GfYRgjWssC8AGpSlVzSu5YfbHXEtHXyLeEY7gqqbAaASwJEP0Oy3Q54Jfw=="
"requested": "[10.0.11, )",
"resolved": "10.0.11",
"contentHash": "ayYHfHtraz6Z6kFQrlTVJ4lV8jG11noHfu6fWAdeP6I6coGCym14V06jZApgk/9c74HoP8Wmcpxd1NokbKFdbQ=="
}
},
"net10.0/linux-x64": {},
Expand Down
14 changes: 7 additions & 7 deletions ICSharpCode.Decompiler.PowerShell/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,21 @@
},
"System.Collections.Immutable": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "Ih5zrydoDc1H5I0eNP6f4Lzw3cjsPMN4Nikd86kbyi66y0flkM9GfjVo62aUbcxeTbypzBCFAFQ+/6RF2jRORg==",
"requested": "[10.0.11, )",
"resolved": "10.0.11",
"contentHash": "BQY956wwWSjRDoOspL6L1JscbFoSgJK606mO3PYalBHIZRV+Sc2xokvR/NHLlpUEfju6EbW5GbKbNpVYQ65cLw==",
"dependencies": {
"System.Memory": "4.6.3",
"System.Runtime.CompilerServices.Unsafe": "6.1.2"
}
},
"System.Reflection.Metadata": {
"type": "CentralTransitive",
"requested": "[10.0.10, )",
"resolved": "10.0.10",
"contentHash": "NZIS6/IUBh70nJfVvE577oDc81y5GfYRgjWssC8AGpSlVzSu5YfbHXEtHXyLeEY7gqqbAaASwJEP0Oy3Q54Jfw==",
"requested": "[10.0.11, )",
"resolved": "10.0.11",
"contentHash": "ayYHfHtraz6Z6kFQrlTVJ4lV8jG11noHfu6fWAdeP6I6coGCym14V06jZApgk/9c74HoP8Wmcpxd1NokbKFdbQ==",
"dependencies": {
"System.Collections.Immutable": "10.0.10"
"System.Collections.Immutable": "10.0.11"
}
},
"System.Runtime.CompilerServices.Unsafe": {
Expand Down
Loading
Loading