Merge pull request #90426 from mikeash/test-target-version-fix