Skip to content

Commit bd3c354

Browse files
Washi1337Washi1337
authored
Merge pull request #713 from Washi1337/development
6.0.0-beta.6
2 parents 626b683 + 6ea7654 commit bd3c354

219 files changed

Lines changed: 7165 additions & 4365 deletions

File tree

Some content is hidden

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

‎.github/workflows/test-and-publish.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-24.04
3131
steps:
3232
- name: Upload event file
33-
uses: actions/upload-artifact@v5
33+
uses: actions/upload-artifact@v6
3434
with:
3535
name: test-event-file
3636
path: ${{ github.event_path }}
@@ -88,26 +88,26 @@ jobs:
8888
- name: Build on master branch
8989
if: ${{github.ref == 'refs/heads/master'}}
9090
run: |
91-
dotnet restore AsmResolver.sln
92-
dotnet build AsmResolver.sln `
91+
dotnet restore AsmResolver.slnx
92+
dotnet build AsmResolver.slnx `
9393
--configuration Release `
9494
--property:CheckEolTargetFramework=false
9595
9696
# For non-master branches (e.g., development or feature branches) we apply a fixup on the version suffix.
9797
- name: Build on non-master branch
9898
if: ${{github.ref != 'refs/heads/master'}}
9999
run: |
100-
dotnet restore AsmResolver.sln `
100+
dotnet restore AsmResolver.slnx `
101101
--property:VersionSuffix=${{needs.get-version.outputs.version_suffix}} `
102102
--property:CheckEolTargetFramework=false
103103
104-
dotnet build AsmResolver.sln `
104+
dotnet build AsmResolver.slnx `
105105
--configuration Release `
106106
--property:VersionSuffix=${{needs.get-version.outputs.version_suffix}} `
107107
--property:CheckEolTargetFramework=false
108108
109109
- name: Upload Build Artifacts
110-
uses: actions/upload-artifact@v5
110+
uses: actions/upload-artifact@v6
111111
with:
112112
name: build-artifacts
113113
path: artifacts/
@@ -187,7 +187,7 @@ jobs:
187187

188188

189189
- name: Download Build Artifacts
190-
uses: actions/download-artifact@v6
190+
uses: actions/download-artifact@v7
191191
with:
192192
name: build-artifacts
193193
path: artifacts/
@@ -198,7 +198,7 @@ jobs:
198198
shell: pwsh
199199
if: "${{ matrix.runner.arch == 'x86' }}"
200200
run: |
201-
& "${{ steps.dotnet-path.outputs.exe-path }}" test AsmResolver.sln `
201+
& "${{ steps.dotnet-path.outputs.exe-path }}" test AsmResolver.slnx `
202202
--arch x86 `
203203
--configuration Release `
204204
--property:VersionSuffix=${{needs.get-version.outputs.version_suffix}} `
@@ -210,7 +210,7 @@ jobs:
210210
shell: pwsh
211211
if: "${{ matrix.runner.arch == 'x64' }}"
212212
run: |
213-
& "${{ steps.dotnet-path.outputs.exe-path }}" test AsmResolver.sln `
213+
& "${{ steps.dotnet-path.outputs.exe-path }}" test AsmResolver.slnx `
214214
--configuration Release `
215215
--property:VersionSuffix=${{needs.get-version.outputs.version_suffix}} `
216216
--property:CheckEolTargetFramework=false `
@@ -220,7 +220,7 @@ jobs:
220220
221221
# Collect all trx files and upload them.
222222
- name: Upload Test Results
223-
uses: actions/upload-artifact@v5
223+
uses: actions/upload-artifact@v6
224224
if: always()
225225
with:
226226
name: test-results-${{matrix.runner.image}}-${{matrix.runner.arch}}
@@ -245,7 +245,7 @@ jobs:
245245
dotnet-version: 10.0.x
246246

247247
- name: Download Build Artifacts
248-
uses: actions/download-artifact@v6
248+
uses: actions/download-artifact@v7
249249
with:
250250
name: build-artifacts
251251
path: artifacts/

‎.github/workflows/test-results-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
- uses: actions/checkout@v6
2626

2727
- name: Download Event File
28-
uses: actions/download-artifact@v4
28+
uses: actions/download-artifact@v7
2929
with:
3030
run-id: ${{ github.event.workflow_run.id }}
3131
github-token: ${{ github.token }}
3232
name: test-event-file
3333
merge-multiple: false
3434

3535
- name: Download Test Results
36-
uses: actions/download-artifact@v4
36+
uses: actions/download-artifact@v7
3737
with:
3838
run-id: ${{ github.event.workflow_run.id }}
3939
github-token: ${{ github.token }}

‎AsmResolver.sln‎

Lines changed: 0 additions & 569 deletions
This file was deleted.

‎AsmResolver.slnx‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Folder Name="/docs/" />
8+
<Folder Name="/Solution Items/">
9+
<File Path=".editorconfig" />
10+
<File Path=".gitignore" />
11+
<File Path="CONTRIBUTING.md" />
12+
<File Path="Directory.Build.props" />
13+
<File Path="LICENSE.md" />
14+
<File Path="README.md" />
15+
</Folder>
16+
<Folder Name="/src/">
17+
<File Path="src/Directory.Build.props" />
18+
<Project Path="src/AsmResolver.DotNet.Dynamic/AsmResolver.DotNet.Dynamic.csproj" />
19+
<Project Path="src/AsmResolver.DotNet/AsmResolver.DotNet.csproj" />
20+
<Project Path="src/AsmResolver.PE.File/AsmResolver.PE.File.csproj" />
21+
<Project Path="src/AsmResolver.PE.Win32Resources/AsmResolver.PE.Win32Resources.csproj" />
22+
<Project Path="src/AsmResolver.PE/AsmResolver.PE.csproj" />
23+
<Project Path="src/AsmResolver.Symbols.Pdb/AsmResolver.Symbols.Pdb.csproj" />
24+
<Project Path="src/AsmResolver/AsmResolver.csproj" />
25+
</Folder>
26+
<Folder Name="/test/">
27+
<File Path="test/Directory.Build.props" />
28+
<Project Path="test/AsmResolver.Benchmarks/AsmResolver.Benchmarks.csproj" />
29+
<Project Path="test/AsmResolver.DotNet.Dynamic.Tests/AsmResolver.DotNet.Dynamic.Tests.csproj" />
30+
<Project Path="test/AsmResolver.DotNet.Tests/AsmResolver.DotNet.Tests.csproj" />
31+
<Project Path="test/AsmResolver.PE.File.Tests/AsmResolver.PE.File.Tests.csproj" />
32+
<Project Path="test/AsmResolver.PE.Tests/AsmResolver.PE.Tests.csproj" />
33+
<Project Path="test/AsmResolver.PE.Win32Resources.Tests/AsmResolver.PE.Win32Resources.Tests.csproj" />
34+
<Project Path="test/AsmResolver.Symbols.Pdb.Tests/AsmResolver.Symbols.Pdb.Tests.csproj" />
35+
<Project Path="test/AsmResolver.Tests/AsmResolver.Tests.csproj" />
36+
</Folder>
37+
<Folder Name="/test/TestBinaries/" />
38+
<Folder Name="/test/TestBinaries/DotNet/">
39+
<File Path="test/TestBinaries/DotNet/Directory.Build.props" />
40+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.CustomAttributes/AsmResolver.DotNet.TestCases.CustomAttributes.csproj" />
41+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Events/AsmResolver.DotNet.TestCases.Events.csproj" />
42+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Fields/AsmResolver.DotNet.TestCases.Fields.csproj" />
43+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Generics/AsmResolver.DotNet.TestCases.Generics.csproj" />
44+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Methods/AsmResolver.DotNet.TestCases.Methods.csproj" />
45+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.MultiModules/AsmResolver.DotNet.TestCases.MultiModules.csproj" />
46+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.NestedClasses/AsmResolver.DotNet.TestCases.NestedClasses.csproj" />
47+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Properties/AsmResolver.DotNet.TestCases.Properties.csproj" />
48+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Resources/AsmResolver.DotNet.TestCases.Resources.csproj" />
49+
<Project Path="test/TestBinaries/DotNet/AsmResolver.DotNet.TestCases.Types/AsmResolver.DotNet.TestCases.Types.csproj" />
50+
<Project Path="test/TestBinaries/DotNet/ClassLibraryVB/ClassLibraryVB.vbproj" />
51+
<Project Path="test/TestBinaries/DotNet/HelloWorld/HelloWorld.csproj" />
52+
<Project Path="test/TestBinaries/DotNet/HelloWorldVB/HelloWorldVB.vbproj" />
53+
<Project Path="test/TestBinaries/DotNet/TheAnswer/TheAnswer.csproj" />
54+
</Folder>
55+
<Folder Name="/test/TestBinaries/Native/">
56+
<Project Path="test/TestBinaries/Native/CallManagedExport/CallManagedExport.vcxproj">
57+
<Build Solution="*|Any CPU" Project="false" />
58+
</Project>
59+
<Project Path="test/TestBinaries/Native/SimpleDll/SimpleDll.vcxproj">
60+
<Platform Solution="*|Any CPU" Project="Win32" />
61+
<Build Solution="*|Any CPU" Project="false" />
62+
</Project>
63+
<Project Path="test/TestBinaries/Native/TlsTest/TlsTest.vcxproj">
64+
<Platform Solution="*|Any CPU" Project="Win32" />
65+
<Build Solution="*|Any CPU" Project="false" />
66+
</Project>
67+
</Folder>
68+
<Folder Name="/tools/">
69+
<File Path="tools/Directory.Build.props" />
70+
<Project Path="tools/AsmResolver.PE.Exports.OrdinalMapper/AsmResolver.PE.Exports.OrdinalMapper.csproj" />
71+
<Project Path="tools/AsmResolver.SourceGenerators/AsmResolver.SourceGenerators.csproj" />
72+
</Folder>
73+
</Solution>

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Copyright>Copyright © Washi 2016-2025</Copyright>
4+
<Copyright>Copyright © Washi 2016-2026</Copyright>
55
<PackageLicenseExpression>MIT</PackageLicenseExpression>
66
<RepositoryUrl>https://github.com/Washi1337/AsmResolver</RepositoryUrl>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
99
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
10-
<LangVersion>13</LangVersion>
10+
<LangVersion>14</LangVersion>
1111
<VersionPrefix>6.0.0</VersionPrefix>
12-
<VersionSuffix>beta.5</VersionSuffix>
12+
<VersionSuffix>beta.6</VersionSuffix>
1313
<Deterministic>true</Deterministic>
1414
<UseArtifactsOutput>true</UseArtifactsOutput>
1515
<CheckEolTargetFramework>false</CheckEolTargetFramework>

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22
=====================
33

4-
Copyright © `2016-2025 Washi`
4+
Copyright © `2016-2026 Washi`
55

66
Permission is hereby granted, free of charge, to any person
77
obtaining a copy of this software and associated documentation

‎docs/guides/dotnet/advanced-module-reading.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ custom implementation of the `INetModuleResolver` interface.
7979
``` csharp
8080
public class CustomNetModuleResolver : INetModuleResolver
8181
{
82-
public ModuleDefinition Resolve(string name)
82+
public ModuleDefinition Resolve(string name, ModuleDefinition originModule)
8383
{
8484
// ...
8585
}

0 commit comments

Comments
 (0)