Skip to content

Commit b58dd69

Browse files
workgroupengineeringworkgroupengineering
committed
Merge branch 'master' into feature/ReferenceAssemblyOverly
2 parents e72b1f9 + 123da88 commit b58dd69

File tree

126 files changed

+3057
-2216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3057
-2216
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
- uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
17-
- name: Setup .NET
18-
uses: actions/setup-dotnet@v3
17+
- uses: actions/setup-dotnet@v4
1918
with:
20-
dotnet-version: 6.0.x
19+
dotnet-version: '8.0.x'
20+
dotnet-quality: 'ga'
2121

2222
- name: Install dependencies
2323
run: dotnet restore ILSpy.XPlat.slnf

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
submodules: true
2727
fetch-depth: 0
2828

29+
- uses: actions/setup-dotnet@v4
30+
with:
31+
dotnet-version: '8.0.x'
32+
dotnet-quality: 'ga'
33+
2934
- name: Add msbuild to PATH
3035
uses: microsoft/[email protected]
3136

@@ -48,9 +53,9 @@ jobs:
4853
- name: Execute unit tests
4954
run: dotnet test --logger "junit;LogFileName=${{ matrix.configuration }}.xml" --results-directory test-results $env:Tests1 $env:Tests2 $env:Tests3
5055
env:
51-
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ICSharpCode.Decompiler.Tests.dll
52-
Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net6.0-windows\ILSpy.Tests.dll
53-
Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net6.0-windows\win-x64\ILSpy.BamlDecompiler.Tests.dll
56+
Tests1: ICSharpCode.Decompiler.Tests\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\ICSharpCode.Decompiler.Tests.dll
57+
Tests2: ILSpy.Tests\bin\${{ matrix.configuration }}\net8.0-windows\ILSpy.Tests.dll
58+
Tests3: ILSpy.BamlDecompiler.Tests\bin\${{ matrix.configuration }}\net8.0-windows\win-x64\ILSpy.BamlDecompiler.Tests.dll
5459

5560
- name: Upload Test Logs
5661
uses: actions/upload-artifact@v3
@@ -76,19 +81,19 @@ jobs:
7681
git diff --exit-code
7782
7883
- name: Zip ILSpy (framework-dependent)
79-
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*.json .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net6.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
84+
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries.zip .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.dll .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.exe .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.config .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*.json .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*\ILSpy.resources.dll .\ILSpy\bin\${{ matrix.configuration }}\net8.0-windows\*\ILSpy.ReadyToRun.Plugin.resources.dll
8085

8186
- name: Publish x64/arm64 framework-dependent/self-contained
8287
shell: pwsh
8388
run: .\publish.ps1
8489

8590
- name: Zip ILSpy Release (x64 self-contained)
8691
if: matrix.configuration == 'release'
87-
run: 7z a -tzip $env:StagingDirectory\ILSpy_selfcontained_x64.zip .\ILSpy\bin\Release\net6.0-windows\win-x64\publish\selfcontained\*
92+
run: 7z a -tzip $env:StagingDirectory\ILSpy_selfcontained_x64.zip .\ILSpy\bin\Release\net8.0-windows\win-x64\publish\selfcontained\*
8893

8994
- name: Zip ILSpy Release (arm64 framework-dependent)
9095
if: matrix.configuration == 'release'
91-
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net6.0-windows\win-arm64\publish\fwdependent\*
96+
run: 7z a -tzip $env:StagingDirectory\ILSpy_binaries_arm64.zip .\ILSpy\bin\Release\net8.0-windows\win-arm64\publish\fwdependent\*
9297

9398
- name: Build Installer (x64 and arm64, framework-dependent)
9499
if: matrix.configuration == 'release'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ jobs:
2323
fetch-depth: 0
2424

2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@v2
26+
uses: github/codeql-action/init@v3
2727
with:
2828
languages: ${{ matrix.language }}
2929

30-
- name: Setup .NET
31-
uses: actions/setup-dotnet@v3
30+
- uses: actions/setup-dotnet@v4
3231
with:
33-
dotnet-version: 6.0.x
32+
dotnet-version: '8.0.x'
33+
dotnet-quality: 'ga'
3434

3535
- name: Build
3636
run: dotnet build ILSpy.XPlat.slnf --configuration Release
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@v2
39+
uses: github/codeql-action/analyze@v3

‎.github/workflows/lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
lock:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: dessant/lock-threads@v4.0.1
11+
- uses: dessant/lock-threads@v5.0.1
1212
with:
1313
github-token: ${{ github.token }}
1414
issue-inactive-days: '90'

‎Directory.Packages.props‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="AvalonEdit" Version="6.3.0.90" />
8+
<PackageVersion Include="CliWrap" Version="3.4.4" />
9+
<PackageVersion Include="DataGridExtensions" Version="2.5.15" />
10+
<PackageVersion Include="DiffLib" Version="2017.7.26.1241" />
11+
<PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
12+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
13+
<PackageVersion Include="ILCompiler.Reflection.ReadyToRun.Experimental" Version="8.0.0-rc.2.23471.30" />
14+
<PackageVersion Include="Iced" Version="1.18.0" />
15+
<PackageVersion Include="JunitXml.TestLogger" Version="3.0.134" />
16+
<PackageVersion Include="K4os.Compression.LZ4" Version="1.3.6" />
17+
<PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.0" />
18+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
19+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.8.0" />
20+
<PackageVersion Include="Microsoft.DiaSymReader.Converter.Xml" Version="1.1.0-beta2-22171-02" />
21+
<PackageVersion Include="Microsoft.DiaSymReader" Version="1.4.0" />
22+
<PackageVersion Include="Microsoft.DiaSymReader.Native" Version="17.0.0-beta1.21524.1" />
23+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
25+
<PackageVersion Include="Microsoft.NETCore.ILAsm" Version="8.0.0" />
26+
<PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="8.0.0" />
27+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
28+
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.7.26" />
29+
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
30+
<PackageVersion Include="Mono.Cecil" Version="0.11.5" />
31+
<PackageVersion Include="NSubstitute" Version="5.0.0" />
32+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.16" />
33+
<PackageVersion Include="NUnit" Version="4.0.1" />
34+
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
35+
<PackageVersion Include="NuGet.Protocol" Version="6.8.0" />
36+
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
37+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
38+
<PackageVersion Include="System.Composition" Version="8.0.0" />
39+
<PackageVersion Include="System.Memory" Version="4.5.5" />
40+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
41+
<PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
42+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
43+
<PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.10.0" />
44+
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
45+
</ItemGroup>
46+
</Project>

‎ICSharpCode.Decompiler.PowerShell/ICSharpCode.Decompiler.PowerShell.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
<LangVersion>8.0</LangVersion>
99
</PropertyGroup>
1010

11-
<Import Project="..\packages.props" />
12-
1311
<ItemGroup>
14-
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
15-
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
12+
<PackageReference Include="PowerShellStandard.Library" />
13+
<PackageReference Include="Mono.Cecil" />
1614
</ItemGroup>
1715

1816
<ItemGroup>

‎ICSharpCode.Decompiler.TestRunner/ICSharpCode.Decompiler.TestRunner.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

‎ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void AllFilesHaveTests()
4646
if (file.Extension == ".txt" || file.Extension == ".exe" || file.Extension == ".config")
4747
continue;
4848
var testName = Path.GetFileNameWithoutExtension(file.Name);
49-
Assert.Contains(testName, testNames);
49+
Assert.That(testNames, Has.Member(testName));
5050
}
5151
}
5252

@@ -486,7 +486,7 @@ async Task RunIL(string testFileName, CompilerOptions options = CompilerOptions.
486486
bool optionsForce32Bit = options.HasFlag(CompilerOptions.Force32Bit);
487487
bool asmOptionsForce32Bit = asmOptions.HasFlag(AssemblerOptions.Force32Bit);
488488

489-
Assert.AreEqual(optionsForce32Bit, asmOptionsForce32Bit, "Inconsistent architecture.");
489+
Assert.That(asmOptionsForce32Bit, Is.EqualTo(optionsForce32Bit), "Inconsistent architecture.");
490490

491491
try
492492
{

‎ICSharpCode.Decompiler.Tests/DataFlowTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public RDTest(ILFunction f, ILVariable v) : base(f, _ => true, CancellationToken
4545

4646
protected internal override void VisitTryFinally(TryFinally inst)
4747
{
48-
Assert.IsTrue(IsPotentiallyUninitialized(state, v));
48+
Assert.That(IsPotentiallyUninitialized(state, v));
4949
base.VisitTryFinally(inst);
50-
Assert.IsTrue(state.IsReachable);
51-
Assert.AreEqual(1, GetStores(state, v).Count());
52-
Assert.IsFalse(IsPotentiallyUninitialized(state, v));
50+
Assert.That(state.IsReachable);
51+
Assert.That(GetStores(state, v).Count(), Is.EqualTo(1));
52+
Assert.That(!IsPotentiallyUninitialized(state, v));
5353
}
5454
}
5555

‎ICSharpCode.Decompiler.Tests/DisassemblerPrettyTestRunner.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void AllFilesHaveTests()
4747
if (file.Extension.Equals(".il", StringComparison.OrdinalIgnoreCase))
4848
{
4949
var testName = file.Name.Split('.')[0];
50-
Assert.Contains(testName, testNames);
50+
Assert.That(testNames, Has.Member(testName));
5151
}
5252
}
5353
}

0 commit comments

Comments
 (0)