[MacOS] Add R to macOS images (#4996)

* Add R to macOS images

* Remove redundant already existing functions and tests

images/macos/software-report/SoftwareReport.Generator.ps1

@@ -48,14 +48,9 @@ $languageAndRuntimeList = @(
     (Get-ClangLLVMVersion)
     (Get-GccVersion)
     (Get-FortranVersion)
+    (Get-RVersion)
 )
 
-if ($os.IsCatalina) {
-    $languageAndRuntimeList += @(
-        (Get-RVersion)
-    )
-}
-
 # To sort GCC and Gfortran correctly, we need to use natural sort https://gist.github.com/markwragg/e2a9dc05f3464103d6998298fb575d4e#file-sort-natural-ps1
 $toNatural = { [regex]::Replace($_, '\d+', { $args[0].Value.PadLeft(20) }) }
 $markdown += New-MDList -Style Unordered -Lines ($languageAndRuntimeList | Sort-Object $toNatural)

images/macos/tests/BasicTools.Tests.ps1

@@ -150,7 +150,7 @@ Describe "xctool" -Skip:($os.IsHigherThanCatalina) {
     }
 }
 
-Describe "R" -Skip:($os.IsHigherThanCatalina) {
+Describe "R" {
     It "R" {
         "R --version" | Should -ReturnZeroExitCode
     }

images/macos/toolsets/toolset-11.json

@@ -194,7 +194,8 @@
             "zstd",
             "zlib",
             "libxext",
-            "libxft"
+            "libxft",
+            "r"
         ],
         "cask_packages": [
             "julia"

images/macos/toolsets/toolset-12.json

@@ -110,7 +110,8 @@
             "gmp",
             "zlib",
             "libxext",
-            "libxft"
+            "libxft",
+            "r"
         ],
         "cask_packages": [
             "julia"