diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 5132904..efce805 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -3,6 +3,8 @@ English (US) release notes, mirroring CHANGELOG.md (Brazilian Portuguese). Before publishing a version, add a `## [VERSION]` section to **both** files: the workflow publishes the section matching the tag from each one and fails if either is missing. ## [Unreleased] +### Changes +- **Receive test versions** now brings betas only. Alpha versions, like those of the upcoming 2.0, are closed tests and no longer arrive through the app's updates, even with the option on. (#223) ## [1.7.1-beta.3] ### Fixes diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b9d45b..67a1190 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ Notas em português do Brasil; a versão em inglês (Estados Unidos) fica em `CHANGELOG.en-US.md`. Antes de publicar uma versão, adicione uma seção `## [VERSÃO]` com o changelog daquela versão **nos dois arquivos**. O workflow publica as duas seções correspondentes à tag na mesma release e falha se faltar alguma. ## [Unreleased] +### Mudanças +- **Receber versões de teste** agora traz só as betas. As versões alpha, como as da futura 2.0, são testes fechados e não chegam mais pela atualização do app, nem com a opção ligada. (#223) ## [1.7.1-beta.3] ### Correções diff --git a/README.de-DE.md b/README.de-DE.md index 701d07b..94f685e 100644 --- a/README.de-DE.md +++ b/README.de-DE.md @@ -18,7 +18,7 @@ Hol dir die neueste stabile Version unter **[Releases](https://github.com/lippde - **`ConsoleMode-Portable-x64.exe`**: eine einzelne EXE, die ihre Daten direkt daneben speichert. - Oder mit winget: `winget install lippdev.ConsoleMode` -Du willst Neues vor allen anderen ausprobieren? Schalte unter System → App „Testversionen erhalten (Alpha und Beta)“ ein. +Du willst Neues vor allen anderen ausprobieren? Schalte unter System → App „Testversionen erhalten (Beta)“ ein. Windows 10 oder 11, dazu [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) oder die Xbox-App. [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) ist optional, für die FPS-Begrenzung und die FPS-Anzeige. diff --git a/README.es-ES.md b/README.es-ES.md index bedf3b5..a78e3ad 100644 --- a/README.es-ES.md +++ b/README.es-ES.md @@ -18,7 +18,7 @@ Descarga la última versión estable desde **[la página de releases](https://gi - **`ConsoleMode-Portable-x64.exe`**: un solo exe que guarda sus datos a su lado. - O con winget: `winget install lippdev.ConsoleMode` -¿Quieres probar lo que viene antes que nadie? Activa Sistema → Aplicación → "Recibir versiones de prueba (alfa y beta)". +¿Quieres probar lo que viene antes que nadie? Activa Sistema → Aplicación → "Recibir versiones de prueba (beta)". Windows 10 u 11, más [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) o la aplicación Xbox. [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) es opcional, para el límite de FPS y el contador de FPS. diff --git a/README.fr-FR.md b/README.fr-FR.md index c45d634..21c5ae2 100644 --- a/README.fr-FR.md +++ b/README.fr-FR.md @@ -18,7 +18,7 @@ Récupérez la dernière version stable sur **[la page des versions](https://git - **`ConsoleMode-Portable-x64.exe`** : un seul exe qui garde ses données à côté de lui. - Ou avec winget : `winget install lippdev.ConsoleMode` -Envie d'essayer la suite avant tout le monde ? Activez Système → Application → « Recevoir les versions de test (alpha et bêta) ». +Envie d'essayer la suite avant tout le monde ? Activez Système → Application → « Recevoir les versions de test (bêta) ». Windows 10 ou 11, plus [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) ou l'application Xbox. [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) est facultatif, pour la limite de FPS et le compteur de FPS. diff --git a/README.md b/README.md index f2b47b2..d92dffd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Get **[1.7.0](https://github.com/lippdev/consolemode/releases/tag/v1.7.0)**, the On 1.6? The app offers the update and keeps your settings. Prefer the old interface, with its Desktop mode? The same release has **Console Mode Legacy** (`ConsoleModeLegacy-Setup-x64.exe` or `ConsoleModeLegacy-Portable-x64.exe`): 1.6.2 as it was, sharing your settings with the current version. It is frozen: no fixes and no updates. -Want to try what comes next before everyone else? Turn on System → App → "Receive test versions (alpha and beta)". +Want to try what comes next before everyone else? Turn on System → App → "Receive test versions (beta)". Windows 10 or 11, plus [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) or the Xbox app. [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) is optional, for the FPS limit and the FPS counter. diff --git a/README.pt-BR.md b/README.pt-BR.md index ba365b9..1f4e785 100644 --- a/README.pt-BR.md +++ b/README.pt-BR.md @@ -20,7 +20,7 @@ Baixe a **[1.7.0](https://github.com/lippdev/consolemode/releases/tag/v1.7.0)**, Está na 1.6? O app oferece a atualização e mantém suas configurações. Prefere a interface antiga, com o modo Desktop? A mesma release tem o **Console Mode Legacy** (`ConsoleModeLegacy-Setup-x64.exe` ou `ConsoleModeLegacy-Portable-x64.exe`): a 1.6.2 como era, dividindo seus ajustes com a versão atual. Está congelado: sem correções e sem atualizações. -Quer testar o que vem aí antes de todo mundo? Ligue Sistema → App → "Receber versões de teste (alpha e beta)". +Quer testar o que vem aí antes de todo mundo? Ligue Sistema → App → "Receber versões de teste (beta)". Windows 10 ou 11, com [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) ou o app Xbox. O [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) é opcional, para o limite de FPS e o contador de FPS. diff --git a/README.ru-RU.md b/README.ru-RU.md index 313e04b..6b0eac1 100644 --- a/README.ru-RU.md +++ b/README.ru-RU.md @@ -18,7 +18,7 @@ https://github.com/user-attachments/assets/9f244c06-76e5-4ccb-ab66-e637eae900ec - **`ConsoleMode-Portable-x64.exe`**: один exe-файл, который хранит данные рядом с собой. - Или через winget: `winget install lippdev.ConsoleMode` -Хотите опробовать новинки раньше всех? Включите «Система» → «Приложение» → «Получать тестовые версии (альфа и бета)». +Хотите опробовать новинки раньше всех? Включите «Система» → «Приложение» → «Получать тестовые версии (бета)». Windows 10 или 11, а также [Steam](https://store.steampowered.com/) (Big Picture), [Playnite](https://playnite.link/) или приложение Xbox. [RTSS](https://www.guru3d.com/files-details/rtss-rivatuner-statistics-server-download.html) необязателен: он нужен для ограничения FPS и счётчика FPS. diff --git a/src/ConsoleMode/Resources/Strings.de-DE.json b/src/ConsoleMode/Resources/Strings.de-DE.json index fcc74df..64278c0 100644 --- a/src/ConsoleMode/Resources/Strings.de-DE.json +++ b/src/ConsoleMode/Resources/Strings.de-DE.json @@ -164,7 +164,7 @@ "CheckNow": "Jetzt suchen", "NotifyUpdatesCard": "Bei einer neuen Version benachrichtigen", "NotifyUpdatesDescription": "Prüft beim Start der App die GitHub-Releases.", - "BetaUpdatesCard": "Testversionen erhalten (Alpha und Beta)", + "BetaUpdatesCard": "Testversionen erhalten (Beta)", "BetaUpdatesDescription": "Erhalte Vorabversionen, um beim Testen zu helfen. Sie können Fehler enthalten. Wenn du diese Option deaktivierst, wechselst du nicht zur stabilen Version zurück: Du erhältst die nächste stabile Version, sobald sie erscheint.", "BetaUpdatesWarning": "Testversionen können auf manchen Systemen Probleme verursachen. Wenn etwas nicht mehr funktioniert, lade die stabile Version von der Releases-Seite herunter und sende uns über die Feedback-Schaltfläche eine Rückmeldung.", "HelpDataSection": "Tastenkombination, Hilfe und Daten", diff --git a/src/ConsoleMode/Resources/Strings.en-US.json b/src/ConsoleMode/Resources/Strings.en-US.json index 06f4e0d..e94cb51 100644 --- a/src/ConsoleMode/Resources/Strings.en-US.json +++ b/src/ConsoleMode/Resources/Strings.en-US.json @@ -164,7 +164,7 @@ "CheckNow": "Check now", "NotifyUpdatesCard": "Notify me when a new version is available", "NotifyUpdatesDescription": "Checks GitHub releases when the app starts.", - "BetaUpdatesCard": "Receive test versions (alpha and beta)", + "BetaUpdatesCard": "Receive test versions (beta)", "BetaUpdatesDescription": "Get early versions before everyone else to help test them. They can have bugs. Turning this off doesn't go back to the stable version: you'll get the next stable one when it comes out.", "BetaUpdatesWarning": "Test versions can fail on some setups. If something breaks, download the stable version from the releases page and tell us with the feedback button.", "HelpDataSection": "Shortcut, help, and data", diff --git a/src/ConsoleMode/Resources/Strings.es-ES.json b/src/ConsoleMode/Resources/Strings.es-ES.json index d712779..1e82482 100644 --- a/src/ConsoleMode/Resources/Strings.es-ES.json +++ b/src/ConsoleMode/Resources/Strings.es-ES.json @@ -164,7 +164,7 @@ "CheckNow": "Buscar ahora", "NotifyUpdatesCard": "Avisarme cuando haya una versión nueva", "NotifyUpdatesDescription": "Consulta las versiones de GitHub al abrir la aplicación.", - "BetaUpdatesCard": "Recibir versiones de prueba (alfa y beta)", + "BetaUpdatesCard": "Recibir versiones de prueba (beta)", "BetaUpdatesDescription": "Recibe las versiones nuevas antes que nadie para ayudar a probarlas. Pueden tener errores. Desactivarlo no vuelve a la versión estable: recibirás la próxima estable cuando salga.", "BetaUpdatesWarning": "Las versiones de prueba pueden fallar en algunas configuraciones. Si algo sale mal, descarga la versión estable en la página de versiones y cuéntanoslo con el botón de comentarios.", "HelpDataSection": "Acceso directo, ayuda y datos", diff --git a/src/ConsoleMode/Resources/Strings.fr-FR.json b/src/ConsoleMode/Resources/Strings.fr-FR.json index cd3c517..f24fd23 100644 --- a/src/ConsoleMode/Resources/Strings.fr-FR.json +++ b/src/ConsoleMode/Resources/Strings.fr-FR.json @@ -164,7 +164,7 @@ "CheckNow": "Vérifier maintenant", "NotifyUpdatesCard": "M'avertir quand une nouvelle version est disponible", "NotifyUpdatesDescription": "Vérifie les versions publiées sur GitHub au démarrage de l'application.", - "BetaUpdatesCard": "Recevoir les versions de test (alpha et bêta)", + "BetaUpdatesCard": "Recevoir les versions de test (bêta)", "BetaUpdatesDescription": "Recevez les versions en avant-première pour aider à les tester. Elles peuvent contenir des bugs. Désactiver cette option ne revient pas à la version stable : vous recevrez la prochaine version stable à sa sortie.", "BetaUpdatesWarning": "Les versions de test peuvent échouer sur certaines configurations. En cas de problème, téléchargez la version stable sur la page des versions et signalez-le-nous avec le bouton de commentaires.", "HelpDataSection": "Raccourci, aide et données", diff --git a/src/ConsoleMode/Resources/Strings.pt-BR.json b/src/ConsoleMode/Resources/Strings.pt-BR.json index 86d01c4..b4813bc 100644 --- a/src/ConsoleMode/Resources/Strings.pt-BR.json +++ b/src/ConsoleMode/Resources/Strings.pt-BR.json @@ -164,7 +164,7 @@ "CheckNow": "Procurar agora", "NotifyUpdatesCard": "Avisar quando sair versão nova", "NotifyUpdatesDescription": "Consulta as releases no GitHub ao abrir o app.", - "BetaUpdatesCard": "Receber versões de teste (alpha e beta)", + "BetaUpdatesCard": "Receber versões de teste (beta)", "BetaUpdatesDescription": "Recebe as versões novas antes de todo mundo para ajudar a testar. Elas podem ter bugs. Desligar não volta para a versão estável: você recebe a próxima estável quando ela sair.", "BetaUpdatesWarning": "Versões de teste podem falhar em alguns setups. Se algo der errado, baixe a versão estável na página de releases e conte pelo botão de feedback.", "HelpDataSection": "Atalho, ajuda e dados", diff --git a/src/ConsoleMode/Resources/Strings.ru-RU.json b/src/ConsoleMode/Resources/Strings.ru-RU.json index 17f512d..6f28d1d 100644 --- a/src/ConsoleMode/Resources/Strings.ru-RU.json +++ b/src/ConsoleMode/Resources/Strings.ru-RU.json @@ -164,7 +164,7 @@ "CheckNow": "Проверить", "NotifyUpdatesCard": "Сообщать о выходе новой версии", "NotifyUpdatesDescription": "Проверяет релизы на GitHub при запуске приложения.", - "BetaUpdatesCard": "Получать тестовые версии (альфа и бета)", + "BetaUpdatesCard": "Получать тестовые версии (бета)", "BetaUpdatesDescription": "Получайте ранние версии раньше всех и помогайте их тестировать. В них могут быть ошибки. Если выключить этот параметр, возврата к стабильной версии не будет: вы получите следующую стабильную, когда она выйдет.", "BetaUpdatesWarning": "Тестовые версии могут не работать на некоторых конфигурациях. Если что-то сломалось, скачайте стабильную версию со страницы релизов и сообщите нам через кнопку отзыва.", "HelpDataSection": "Ярлык, справка и данные", diff --git a/src/ConsoleMode/Services/UpdateChannel.cs b/src/ConsoleMode/Services/UpdateChannel.cs index e0f1607..f319cf7 100644 --- a/src/ConsoleMode/Services/UpdateChannel.cs +++ b/src/ConsoleMode/Services/UpdateChannel.cs @@ -4,9 +4,19 @@ namespace ConsoleMode.Services; public static class UpdateChannel { /// - /// Test versions (alpha/beta) are offered when the user opted in, or when a test version is + /// Test versions (beta) are offered when the user opted in, or when a test version is /// already installed. Turning the option off never downgrades: a test build keeps getting test /// builds until a newer stable one comes out. /// public static bool IncludePrereleases(bool currentIsPrerelease, bool optedIn) => currentIsPrerelease || optedIn; + + /// + /// Whether a version's pre-release label (the "beta" of 1.7.1-beta.2, empty for a stable one) can be offered at all. + /// Betas and release candidates go to testers; alphas never do, whatever the setting: the 2.0 alphas are a closed + /// test of another app and must not reach the 1.x test channel. + /// + public static bool IsOfferedLabel(string? preLabel) => + string.IsNullOrEmpty(preLabel) + || preLabel.StartsWith("beta", StringComparison.OrdinalIgnoreCase) + || preLabel.StartsWith("rc", StringComparison.OrdinalIgnoreCase); } diff --git a/src/ConsoleMode/Services/UpdateService.cs b/src/ConsoleMode/Services/UpdateService.cs index 85ade8a..50b9a13 100644 --- a/src/ConsoleMode/Services/UpdateService.cs +++ b/src/ConsoleMode/Services/UpdateService.cs @@ -68,6 +68,8 @@ private static HttpClient CreateClient() // Old releases were tagged "release"/"app"; fall back to the version in the title. var version = SemVer.TryFind(tag) ?? SemVer.TryFind(name); if (version is null || version.CompareTo(current) <= 0) continue; + // Alphas (the 2.0 ones included) are never offered, test channel or not. + if (!UpdateChannel.IsOfferedLabel(version.PreLabel)) continue; if (bestVersion is not null && version.CompareTo(bestVersion) <= 0) continue; var (assetUrl, assetName, assetDigest) = PickAsset(release); @@ -227,6 +229,9 @@ private SemVer(int[] core, string[] pre) public bool IsPrerelease => _pre.Length > 0; + /// The first pre-release identifier ("beta" in 1.7.1-beta.2), empty for a stable version. + public string PreLabel => _pre.Length > 0 ? _pre[0] : ""; + [GeneratedRegex(@"(\d+)\.(\d+)(?:\.(\d+))?(?:-([0-9A-Za-z.\-]+))?")] private static partial Regex Pattern(); diff --git a/tests/ConsoleMode.Tests/UpdateChannelTests.cs b/tests/ConsoleMode.Tests/UpdateChannelTests.cs index 213667e..4709d0d 100644 --- a/tests/ConsoleMode.Tests/UpdateChannelTests.cs +++ b/tests/ConsoleMode.Tests/UpdateChannelTests.cs @@ -11,4 +11,16 @@ public sealed class UpdateChannelTests [InlineData(true, true, true)] public void Test_versions_are_offered_when_opted_in_or_already_installed(bool currentIsPrerelease, bool optedIn, bool expected) => Assert.Equal(expected, UpdateChannel.IncludePrereleases(currentIsPrerelease, optedIn)); + + [Theory] + [InlineData("", true)] // stable + [InlineData(null, true)] + [InlineData("beta", true)] // 1.7.1-beta.2 + [InlineData("Beta", true)] + [InlineData("rc", true)] // 1.8.0-rc.1 + [InlineData("alpha", false)] // 2.0.0-alpha.1: a closed test, never offered + [InlineData("Alpha", false)] + [InlineData("dev", false)] + public void Only_betas_and_release_candidates_reach_the_test_channel(string? label, bool offered) => + Assert.Equal(offered, UpdateChannel.IsOfferedLabel(label)); }