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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 45 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,45 @@
*.cs diff=csharp
# Set default behavior, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.config text
*.cs text diff=csharp
*.manifest text
*.md text
*.resx text
*.txt text
*.xml text
*.xaml text
*.yml text
*.yaml text
*.json text
*.props text
*.targets text

# Declare files that will always have CRLF line endings on checkout.
*.csproj text eol=crlf
*.dbproj text eol=crlf
*.fsproj text eol=crlf
*.inf text eol=crlf
*.lsproj text eol=crlf
*.modelproj text eol=crlf
*.sln text eol=crlf
*.sqlproj text eol=crlf
*.vbproj text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.wixproj text eol=crlf
*.wmaproj text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.apk binary
*.dll binary
*.exe binary
*.ico binary
*.jpeg binary
*.jpg binary
*.otf binary
*.pdf binary
*.png binary
*.snk binary
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@mkaring
@mcpolo99
4 changes: 1 addition & 3 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
github: mkaring
open_collective: confuserex
custom: ['http://buymeacoff.ee/fFUnXMCdW']
github: mcpolo99
10 changes: 8 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: Question
url: https://github.com/mkaring/ConfuserEx/discussions/categories/q-a
about: Ask and answer questions about ConfuserEx
url: https://github.com/mcpolo99/ConfuserExx/discussions/categories/q-a
about: Ask and answer questions about ConfuserExx
- name: Ideas & Feature Requests
url: https://github.com/mcpolo99/ConfuserExx/discussions/categories/ideas
about: Suggest new features or improvements
- name: General Discussion
url: https://github.com/mcpolo99/ConfuserExx/discussions/categories/general
about: Chat about anything related to ConfuserExx
41 changes: 24 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@ name: ci
on:
push:
branches: [master, pre-release, feature/**, fix/**]
paths-ignore: ['**.md', 'docs/**', 'LICENSE*']
pull_request:
branches: [master, pre-release]
paths-ignore: ['**.md', 'docs/**', 'LICENSE*']

concurrency:
group: ci-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: windows-2022
timeout-minutes: 15
runs-on: windows-2025
timeout-minutes: 10
env:
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
steps:
- uses: actions/checkout@v5
with:
Expand All @@ -18,14 +26,13 @@ jobs:
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2

- name: Install .NET 4.6.1 targeting pack
shell: pwsh
run: |
$url = 'https://download.microsoft.com/download/F/1/D/F1DEB8DB-D277-4EF9-9F48-3A65D4D8F965/NDP461-DevPack-KB3105179-ENU.exe'
$installer = "$env:TEMP\ndp461-devpack.exe"
Invoke-WebRequest -Uri $url -OutFile $installer -UseBasicParsing
Start-Process -FilePath $installer -ArgumentList '/quiet','/norestart' -Wait
Write-Host "Installed .NET 4.6.1 Developer Pack"
- name: Cache NuGet packages
uses: actions/cache@v4
with:
path: ${{ github.workspace }}/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', '**/*.vcxproj') }}
restore-keys: |
${{ runner.os }}-nuget-

- name: Install nbgv
run: dotnet tool install -g nbgv
Expand All @@ -47,15 +54,15 @@ jobs:
- name: Package CLI
shell: pwsh
run: |
$src = 'Confuser.CLI/bin/Release/net461'
$src = 'Confuser.CLI/bin/Release/net10.0'
$zip = 'ConfuserEx-CLI.zip'
Get-ChildItem $src -Exclude '*.pdb','*.xml' | Compress-Archive -DestinationPath $zip
Write-Host "Created $zip ($([math]::Round((Get-Item $zip).Length / 1MB, 1)) MB)"

- name: Package GUI
shell: pwsh
run: |
$src = 'ConfuserEx/bin/Release/net461'
$src = 'ConfuserEx/bin/Release/net10.0-windows'
$zip = 'ConfuserEx-GUI.zip'
Get-ChildItem $src -Exclude '*.pdb','*.xml' | Compress-Archive -DestinationPath $zip
Write-Host "Created $zip ($([math]::Round((Get-Item $zip).Length / 1MB, 1)) MB)"
Expand All @@ -66,13 +73,13 @@ jobs:
$zip = 'ConfuserEx.zip'
$tmp = 'combined'
New-Item -ItemType Directory -Path $tmp -Force | Out-Null
Copy-Item 'Confuser.CLI/bin/Release/net461/*' $tmp -Exclude '*.pdb','*.xml' -Recurse
Copy-Item 'ConfuserEx/bin/Release/net461/*' $tmp -Exclude '*.pdb','*.xml' -Recurse -Force
Copy-Item 'Confuser.CLI/bin/Release/net10.0/*' $tmp -Exclude '*.pdb','*.xml' -Recurse
Copy-Item 'ConfuserEx/bin/Release/net10.0-windows/*' $tmp -Exclude '*.pdb','*.xml' -Recurse -Force
Get-ChildItem $tmp | Compress-Archive -DestinationPath $zip
Remove-Item $tmp -Recurse -Force
Write-Host "Created $zip ($([math]::Round((Get-Item $zip).Length / 1MB, 1)) MB)"

- name: Upload artifacts
- name: Upload packages
uses: actions/upload-artifact@v5
with:
name: confuserex-packages
Expand All @@ -86,7 +93,7 @@ jobs:
pre-release:
needs: build
if: github.event_name == 'push' && github.ref == 'refs/heads/pre-release'
runs-on: windows-2022
runs-on: windows-2025
timeout-minutes: 5
permissions:
contents: write
Expand Down Expand Up @@ -136,7 +143,7 @@ jobs:
release:
needs: build
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
runs-on: windows-2022
runs-on: windows-2025
timeout-minutes: 5
permissions:
contents: write
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ permissions:
jobs:
analyze:
name: Analyze
runs-on: windows-2022
runs-on: windows-2025

strategy:
fail-fast: false

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 0
submodules: recursive
Expand All @@ -37,14 +37,6 @@ jobs:
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v2

- name: Install .NET 4.6.1 targeting pack
shell: pwsh
run: |
$url = 'https://download.microsoft.com/download/F/1/D/F1DEB8DB-D277-4EF9-9F48-3A65D4D8F965/NDP461-DevPack-KB3105179-ENU.exe'
$installer = "$env:TEMP\ndp461-devpack.exe"
Invoke-WebRequest -Uri $url -OutFile $installer -UseBasicParsing
Start-Process -FilePath $installer -ArgumentList '/quiet','/norestart' -Wait

- name: Restore
run: msbuild Confuser2.sln -t:Restore -verbosity:minimal

Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: format

on:
pull_request:
branches: [master, pre-release]
paths: ['**.cs', '**.vb', '.editorconfig']

jobs:
check-format:
runs-on: windows-2025
timeout-minutes: 5
permissions:
contents: read
steps:
- uses: actions/checkout@v5

- name: Check formatting
run: dotnet format Confuser2.sln --verify-no-changes --verbosity diagnostic
continue-on-error: true
id: format-check

- name: Format diff
if: steps.format-check.outcome == 'failure'
shell: pwsh
run: |
dotnet format Confuser2.sln
git diff --stat
$diff = git diff --name-only
if ($diff) {
Write-Host "::warning::The following files need formatting:" -ForegroundColor Yellow
$diff | ForEach-Object { Write-Host " $_" }
Write-Host ""
Write-Host "Run 'dotnet format Confuser2.sln' locally and commit the changes."
exit 1
}
Loading
Loading