Kunal Sachdev · quietone
--- a/core/modules/update/tests/fixtures/release-history/drupal.1.1-unsupported.xml 0 → 100644
+++ b/core/modules/update/tests/fixtures/release-history/drupal.1.1-unsupported.xml 0 → 100644
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file is the exact same as the file drupal.1.xml except
+'supported_branches' in this file does not contain the '8.0.' branch. Therefore,
+all the releases that start with '8.0.' are in an unsupported branch.
--- a/core/modules/update/tests/fixtures/release-history/semver_test.1.1-unsupported.xml 0 → 100644
+++ b/core/modules/update/tests/fixtures/release-history/semver_test.1.1-unsupported.xml 0 → 100644
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This XML file is the exact same as the file semver_test.1.xml except
+'supported_branches' in this file does not contain the '8.0.' branch. Therefore,
+all the releases that start with '8.0.' are in an unsupported branch.
--- a/core/modules/update/tests/src/Functional/UpdateTestBase.php
+++ b/core/modules/update/tests/src/Functional/UpdateTestBase.php
    $this->assertUpdateTableTextContains($unsupported_version);
    $this->assertUpdateTableElementContains('error.svg');
    $this->assertUpdateTableTextContains('Release not supported: Your currently installed release is now unsupported, and is no longer available for download. Disabling everything included in this release or upgrading is strongly recommended!');
-    $this->assertVersionUpdateLinks($new_version_label, $newer_version);
+    if ($newer_version !== NULL) {
-    if ($newer_version !== NULL) {
+    if ($newer_version) {
--- a/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
+++ b/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
      $this->standardTests();
      $this->confirmUnsupportedStatus('8.0.3', '8.1.0', 'Recommended version:');
    }
+    // Test when the newest branch is unsupported and no update is available.
+    foreach (['8.1.0', '8.1.0-beta1'] as $installed) {
+      $this->setProjectInstalledVersion($installed);
+      $this->refreshUpdateStatus([$this->updateProject => '1.1-unsupported']);
+      $this->standardTests();
+      $this->confirmUnsupportedStatus($installed);
+    }
+    // Test when the current version is unsupported and the recommended version is supported and there is also an available version
+    $this->setProjectInstalledVersion('8.0.3');
+    $this->refreshUpdateStatus([$this->updateProject => '1.0-supported']);
+    $this->standardTests();
+    $this->confirmUnsupportedStatus('8.0.3', '8.1.0', 'Recommended version:');
+    $this->confirmUnsupportedStatus('8.0.3', '8.2.0', 'Also available:');
--- a/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
+++ b/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
      $this->confirmUnsupportedStatus('8.0.3', '8.1.0', 'Recommended version:');
    }
+    // Test when the newest branch is unsupported and no update is available.
+    foreach (['8.1.0', '8.1.0-beta1'] as $installed) {
+      $this->setProjectInstalledVersion($installed);
+      $this->refreshUpdateStatus([$this->updateProject => '1.1-unsupported']);
+      $this->standardTests();
+      $this->confirmUnsupportedStatus($installed);
+    }
+    $this->setProjectInstalledVersion('8.0.3');
+    $this->refreshUpdateStatus([$this->updateProject => '1.0-supported']);
+    $this->standardTests();
+    // This shows how the logic is currently broken as it skips all the releases
+    // between 8.0.3 and 10.0.0.
+    $this->confirmUnsupportedStatus('8.0.3', '10.0.0', 'Recommended version:');
+    $this->assertUpdateTableTextNotContains('Also available');
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc

  // If we were unable to find a recommended version, then make the latest
  // version the recommended version if possible.
-  if (!isset($project_data['recommended']) && isset($project_data['latest_version'])) {
+  if (!isset($project_data['recommended']) && isset($project_data['latest_version']) && $release_is_supported) {