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
39 changes: 39 additions & 0 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,42 @@ jobs:
with:
dotnet-version: 8.0.x
- run: dotnet test OpenWrtStudio.Core.Tests/OpenWrtStudio.Core.Tests.csproj -c Release

release:
if: startsWith(github.ref, 'refs/tags/v')
needs: [desktop, portable-core]
runs-on: ubuntu-22.04
permissions:
contents: write
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RELEASE_TAG: ${{ github.ref_name }}
steps:
- uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
with:
name: OpenWrtStudio-win-x64
path: release
- name: Verify complete versioned packages
run: |
python3 - <<'PYTHON'
import os, re
import xml.etree.ElementTree as ET
from pathlib import Path
version = ET.parse('OpenWrtStudio.csproj').findtext('./PropertyGroup/Version')
assert os.environ['RELEASE_TAG'] == 'v' + version
expected = [f'OpenWrtStudio_Setup_v{version}.exe', f'OpenWrtStudio_v{version}_Portable.zip', 'SHA256SUMS.txt']
assert all((Path('release') / name).stat().st_size > 0 for name in expected)
Path('release-notes.txt').write_text(Path('RELEASE_NOTES.md').read_text().split('\n---\n', 1)[0])
PYTHON
(cd release && sha256sum -c SHA256SUMS.txt)
- name: Publish complete release
run: |
set -euo pipefail
if gh release view "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
echo 'Release already exists; refusing to overwrite it.'
exit 1
fi
gh release create "$RELEASE_TAG" release/* --repo "$GITHUB_REPOSITORY" --verify-tag --title "OpenWrt Studio ${RELEASE_TAG#v}" --notes-file release-notes.txt --draft
test "$(gh release view "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY" --json assets --jq '.assets | length')" = 3
gh release edit "$RELEASE_TAG" --repo "$GITHUB_REPOSITORY" --draft=false --latest
6 changes: 3 additions & 3 deletions OpenWrtStudio.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<SelfContained>true</SelfContained>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<Version>2.5.20</Version>
<AssemblyVersion>2.5.20.0</AssemblyVersion>
<FileVersion>2.5.20.0</FileVersion>
<Version>2.5.21</Version>
<AssemblyVersion>2.5.21.0</AssemblyVersion>
<FileVersion>2.5.21.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# OpenWrt Studio v2.5.21

- В разделе «О программе» добавлена кнопка темы OpenWrt Studio на 4PDA: https://4pda.to/forum/index.php?showtopic=1128057.
- Доступны установщик и Portable для Windows x64, а также контрольные суммы SHA-256.

---

# OpenWrt Studio v2.5.20

Проверено 19.10.2026 на реальном роутере и Android-телефоне: переключения подтверждены независимым чтением состояния, исходный VPN и тема восстановлены. Подробности: [VPN_VALIDATION.md](VPN_VALIDATION.md).
Expand Down
10 changes: 10 additions & 0 deletions ViewModels/SettingsViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,16 @@ public void OpenAuthorTelegram()
catch { }
}

[RelayCommand]
public void Open4PdaTopic()
{
try
{
System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo("https://4pda.to/forum/index.php?showtopic=1128057") { UseShellExecute = true });
}
catch { }
}

[RelayCommand]
public void OpenAppTelegram()
{
Expand Down
16 changes: 16 additions & 0 deletions Views/SettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
Expand Down Expand Up @@ -345,6 +346,21 @@
</Grid>
</Border>

<!-- 4PDA: Program discussion -->
<Border Grid.Row="2" Grid.ColumnSpan="2" Margin="0,12,0,0" Background="{DynamicResource ControlFillColorDefaultBrush}" CornerRadius="6" Padding="12">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Center" Margin="0,0,12,0">
<TextBlock Text="Тема программы на 4PDA" FontWeight="SemiBold" FontSize="13" TextWrapping="Wrap" />
<TextBlock Text="Обсуждение, вопросы и отзывы об OpenWrt Studio" FontSize="11" Foreground="{DynamicResource TextFillColorSecondaryBrush}" Margin="0,2,0,0" TextWrapping="Wrap" />
</StackPanel>
<ui:Button Grid.Column="1" Appearance="Secondary" Content="Открыть 4PDA" Command="{Binding Open4PdaTopicCommand}" VerticalAlignment="Center" />
</Grid>
</Border>

<!-- Bug Report -->
<Border Grid.Row="1" Grid.Column="1" Margin="8,0,0,0" Background="{DynamicResource ControlFillColorDefaultBrush}" CornerRadius="6" Padding="12">
<Grid>
Expand Down
2 changes: 1 addition & 1 deletion installer/setup.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; OpenWrt Studio per-user installer. Build with scripts/build-installer.ps1.
#ifndef MyAppVersion
#define MyAppVersion "2.5.20"
#define MyAppVersion "2.5.21"
#endif
#ifndef PublishDir
#define PublishDir "..\publish"
Expand Down