diff --git a/core/includes/update.inc b/core/includes/update.inc
index a5ec1f2234..792e94c286 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -58,7 +58,6 @@ function update_check_incompatibility($name, $type = 'module') {
     $file = $themes[$name];
   }
   if (!isset($file)
-      || !isset($file->info['core_dependency'])
       || $file->info['core_incompatible']
       || version_compare(phpversion(), $file->info['php']) < 0) {
     return TRUE;
diff --git a/core/lib/Drupal/Component/Version/DrupalSemver.php b/core/lib/Drupal/Component/Version/DrupalSemver.php
deleted file mode 100644
index bfce92e17a..0000000000
--- a/core/lib/Drupal/Component/Version/DrupalSemver.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Drupal\Component\Version;
-
-use Composer\Semver\Semver;
-
-/**
- * A utility class for semantic version comparison.
- */
-class DrupalSemver {
-
-  /**
-   * Determines if a version satisfies the given constraints.
-   *
-   * This method uses \Composer\Semver\Semver::satisfies() but returns FALSE if
-   * the version or constraints are not valid instead of throwing an exception.
-   *
-   * @param string $version
-   *   The version.
-   * @param string $constraints
-   *   The constraints.
-   *
-   * @return bool
-   *   TRUE if the version satisfies the constraints, otherwise FALSE.
-   *
-   * @see \Composer\Semver\Semver::satisfies()
-   */
-  public static function satisfies($version, $constraints) {
-    try {
-      return Semver::satisfies($version, $constraints);
-    }
-    catch (\UnexpectedValueException $exception) {
-      return FALSE;
-    }
-  }
-
-}
diff --git a/core/lib/Drupal/Core/Extension/ExtensionList.php b/core/lib/Drupal/Core/Extension/ExtensionList.php
index e5f7a2fee9..dc20679cd2 100644
--- a/core/lib/Drupal/Core/Extension/ExtensionList.php
+++ b/core/lib/Drupal/Core/Extension/ExtensionList.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Extension;
 
-use Drupal\Component\Version\DrupalSemver;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
diff --git a/core/lib/Drupal/Core/Extension/InfoParserDynamic.php b/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
index e34215f420..bc11cb8e9c 100644
--- a/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
+++ b/core/lib/Drupal/Core/Extension/InfoParserDynamic.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Core\Extension;
 
+use Composer\Semver\Semver;
 use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Component\Version\DrupalSemver;
 use Drupal\Core\Serialization\Yaml;
 
 /**
@@ -13,6 +13,29 @@ class InfoParserDynamic implements InfoParserInterface {
 
   const FIRST_CORE_DEPENDENCY_SUPPORTED_VERSION = '8.7.7';
 
+  /**
+   * Determines if a version satisfies the given constraints.
+   *
+   * This method uses \Composer\Semver\Semver::satisfies() but returns FALSE if
+   * the version or constraints are not valid instead of throwing an exception.
+   *
+   * @param string $version
+   *   The version.
+   * @param string $constraints
+   *   The constraints.
+   *
+   * @return bool
+   *   TRUE if the version satisfies the constraints, otherwise FALSE.
+   */
+  protected static function satisfies(string $version, $constraints) {
+    try {
+      return Semver::satisfies($version, $constraints);
+    }
+    catch (\UnexpectedValueException $exception) {
+      return FALSE;
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -50,18 +73,19 @@ public function parse($filename) {
         // 8.7.7 because these versions do not use the 'core_dependency' key.
         // Do not throw the exception if the constraint also is satisfied by
         // 8.0.0-alpha1 to allow constraints such as '^8' or '^8 || ^9'.
-        if ($supports_pre_core_dependency_version && !DrupalSemver::satisfies('8.0.0-alpha1', $parsed_info['core_dependency'])) {
+        if ($supports_pre_core_dependency_version && !static::satisfies('8.0.0-alpha1', $parsed_info['core_dependency'])) {
           throw new InfoParserException("The 'core_dependency' can not be used to specify compatibility specific version before " . static::FIRST_CORE_DEPENDENCY_SUPPORTED_VERSION . " in $filename");
         }
       }
-      else {
-        $parsed_info['core_dependency'] = $parsed_info['core'];
-      }
 
       // Determine if the extension is compatible with the current version of
       // Drupal core.
-      $parsed_info['core_incompatible'] = !DrupalSemver::satisfies(\Drupal::VERSION, $parsed_info['core_dependency']);
-
+      try {
+        $parsed_info['core_incompatible'] = !static::satisfies(\Drupal::VERSION, $parsed_info['core_dependency'] ?? $parsed_info['core']);
+      }
+      catch (\UnexpectedValueException $exception) {
+        $parsed_info['core_incompatible'] = TRUE;
+      }
       if (isset($parsed_info['version']) && $parsed_info['version'] === 'VERSION') {
         $parsed_info['version'] = \Drupal::VERSION;
       }
@@ -117,17 +141,20 @@ protected function isConstraintSatisfiedByPreCoreDependencyCoreVersion($constrai
             $evaluated_constraints[$constraint] = FALSE;
             return $evaluated_constraints[$constraint];
           }
-          if (DrupalSemver::satisfies($minor_version, $constraint)) {
+          if (static::satisfies($minor_version, $constraint)) {
             $evaluated_constraints[$constraint] = TRUE;
             return $evaluated_constraints[$constraint];
           }
           if ($patch === 0) {
-            foreach (['alpha1', 'beta1', 'rc1'] as $suffix) {
-              $pre_release_version = "$minor_version-$suffix";
-              if (DrupalSemver::satisfies($minor_version, $pre_release_version)) {
-                $evaluated_constraints[$constraint] = TRUE;
-                return $evaluated_constraints[$constraint];
+            foreach (['alpha', 'beta', 'rc'] as $suffix) {
+              foreach (range(0, 10) as $suffix_num) {
+                $pre_release_version = "$minor_version-$suffix$suffix_num";
+                if (static::satisfies($pre_release_version, $constraint)) {
+                  $evaluated_constraints[$constraint] = TRUE;
+                  return $evaluated_constraints[$constraint];
+                }
               }
+
             }
           }
         }
diff --git a/core/modules/system/src/Form/ModulesListForm.php b/core/modules/system/src/Form/ModulesListForm.php
index bf73eeccde..9d73b3e43b 100644
--- a/core/modules/system/src/Form/ModulesListForm.php
+++ b/core/modules/system/src/Form/ModulesListForm.php
@@ -300,7 +300,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
         '@core_version' => \Drupal::VERSION,
       ]);
       $row['#requires']['core'] = $this->t('Drupal Core (@core_requirement) (<span class="admin-missing">incompatible with</span> version @core_version)', [
-        '@core_requirement' => $module->info['core_dependency'],
+        '@core_requirement' => $module->info['core_dependency'] ?? $module->info['core'],
         '@core_version' => \Drupal::VERSION,
       ]);
     }
diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ModuleInstallerTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleInstallerTest.php
index e0955a1c3a..8c94c70620 100644
--- a/core/tests/Drupal/KernelTests/Core/Extension/ModuleInstallerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Extension/ModuleInstallerTest.php
@@ -122,7 +122,6 @@ public function providerTestInvalidCoreInstall() {
     ];
   }
 
-
   /**
    * Tests install with a dependency with an invalid core version constraint.
    *
diff --git a/core/tests/Drupal/Tests/Component/Version/DrupalSemverTest.php b/core/tests/Drupal/Tests/Component/Version/DrupalSemverTest.php
deleted file mode 100644
index 44285eaba6..0000000000
--- a/core/tests/Drupal/Tests/Component/Version/DrupalSemverTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Drupal\Tests\Component\Version;
-
-use Drupal\Component\Version\DrupalSemver;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @coversDefaultClass \Drupal\Component\Version\DrupalSemver
- * @group Version
- */
-class DrupalSemverTest extends TestCase {
-
-  /**
-   * @covers ::satisfies
-   * @dataProvider providerSatisfies
-   */
-  public function testSatisfies($version, $constraints, $result) {
-    $this->assertSame($result, DrupalSemver::satisfies($version, $constraints));
-  }
-
-  public function providerSatisfies() {
-    $cases = [
-      ['8.8.0-dev', '8.x', TRUE],
-      ['8.8.0', '8.x', TRUE],
-      ['8.9.9', '8.x', TRUE],
-      ['8.0.0', '8.x', TRUE],
-      ['9.0.0', '8.x', FALSE],
-      ['9.1.0', '8.x', FALSE],
-      ['8.8.0', '~8', TRUE],
-      ['8.8.0', '^8', TRUE],
-      ['8.7.0', '^8.7.6', FALSE],
-      ['8.7.6', '^8.7.6', TRUE],
-      ['8.7.8', '^8.7.6', TRUE],
-      ['9.0.0', '^8.7.6', FALSE],
-      ['8.0.0', '^8 || ^9', TRUE],
-      ['9.1.1', '^8 || ^9', TRUE],
-      ['9.1.1', '^8.7.6 || ^9', TRUE],
-      ['8.7.8', '^8.7.6 || ^9', TRUE],
-      ['8.6.8', '^8.7.6 || ^9', FALSE],
-      ['8.6.8', '^9', FALSE],
-      ['9.1.1', '^9', TRUE],
-      ['9.0.0', '9.x', TRUE],
-      ['8.8.0', '9.x', FALSE],
-      ['8.8.0', '7.x', FALSE],
-      ['a-super-nonsense-string-will-not-throw-an-exception-but-also-will-not-work', '9.x', FALSE],
-      ['a-super-nonsense-string-will-not-throw-an-exception-but-also-will-not-work', '7.x', FALSE],
-      ['a-super-nonsense-string-will-not-throw-an-exception-but-also-will-not-work', '8.x', FALSE],
-    ];
-    $tests = [];
-    foreach ($cases as $case) {
-      $tests[$case[0] . ":" . $case[1]] = $case;
-    }
-    return $tests;
-  }
-
-}
diff --git a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
index 31f7461637..e874cfb53e 100644
--- a/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/InfoParserUnitTest.php
@@ -223,8 +223,10 @@ public function testInvalidCore() {
    * Tests that 'core_dependency' throws an exception if constraint is invalid.
    *
    * @covers ::parse
+   *
+   * @dataProvider providerCoreDependencyInvalid
    */
-  public function testCoreDependencyInvalid() {
+  public function testCoreDependencyInvalid($file_name, $constraint) {
     $invalid_core_dependency = <<<INVALID_CORE_DEPENDENCY
 # info.yml for core_dependency validation.
 name: Gracie Evaluator
@@ -232,7 +234,7 @@ public function testCoreDependencyInvalid() {
 package: Core
 type: module
 version: VERSION
-core_dependency: '^8.7'
+core_dependency: '$constraint'
 dependencies:
   - goodness_api
 INVALID_CORE_DEPENDENCY;
@@ -240,15 +242,27 @@ public function testCoreDependencyInvalid() {
     vfsStream::setup('modules');
     vfsStream::create([
       'fixtures' => [
-        'invalid_core_dependency.info.txt' => $invalid_core_dependency,
+        "$file_name.info.txt" => $invalid_core_dependency,
       ],
     ]);
-    $filename = vfsStream::url('modules/fixtures/invalid_core_dependency.info.txt');
+    $filename = vfsStream::url("modules/fixtures/$file_name.info.txt");
     $this->expectException('\Drupal\Core\Extension\InfoParserException');
-    $this->expectExceptionMessage("The 'core_dependency' can not be used to specify compatibility specific version before 8.7.7 in vfs://modules/fixtures/invalid_core_dependency.info.txt");
+    $this->expectExceptionMessage("The 'core_dependency' can not be used to specify compatibility specific version before 8.7.7 in vfs://modules/fixtures/$file_name.info.txt");
     $this->infoParser->parse($filename);
   }
 
+  /**
+   * Dataprovider for testCoreDependencyInvalid().
+   */
+  public function providerCoreDependencyInvalid() {
+    return [
+      '8.0.0-alpha2' => ['alpha2', '8.0.0-alpha2'],
+      '8.6.0-rc1' => ['rc1', '8.6.0-rc1'],
+      '^8.7' => ['8_7', '^8.7'],
+      '>8.6.3' => ['gt8_6_3', '>8.6.3'],
+    ];
+  }
+
   /**
    * Tests that missing required key is detected.
    *
@@ -303,7 +317,6 @@ public function testInfoParserCommonInfo() {
     $info_values = $this->infoParser->parse(vfsStream::url('modules/fixtures/common_test.info.txt'));
     $this->assertEquals($info_values['simple_string'], 'A simple string', 'Simple string value was parsed correctly.');
     $this->assertEquals($info_values['version'], \Drupal::VERSION, 'Constant value was parsed correctly.');
-    $this->assertSame($info_values['core_dependency'], '8.x');
     $this->assertEquals($info_values['double_colon'], 'dummyClassName::method', 'Value containing double-colon was parsed correctly.');
   }
 
@@ -336,7 +349,7 @@ public function testCoreIncompatibility($file_name, $constraint, $expected) {
   }
 
   /**
-   * Dataprovider for testCoreIncompatibility()
+   * Dataprovider for testCoreIncompatibility().
    */
   public function providerCoreIncompatibility() {
     list($major, $minor) = explode('.', \Drupal::VERSION);