diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 1c272b43..33fa38db 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -4,7 +4,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" -availableVersions=$(ghcup list | grep "ghc " | awk '{print $3}') +availableVersions=$(ghcup list | grep -v "prerelease" | grep "ghc " | awk '{print $3}') minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n3) for majorMinorVersion in $minorMajorVersions; do fullVersion=$(echo "$availableVersions" | grep "$majorMinorVersion." | tail -n1) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index 7a0f3844..3b66441c 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -9,13 +9,18 @@ echo Installing OpenSSL... # Install OpenSSL 1.0.2t # https://www.openssl.org/policies/releasestrat.html - Version 1.0.2 will be supported until 2019-12-31 (LTS) # To preserve backward compatibility with ruby-toolcache -brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/8b9d6d688f483a0f33fcfc93d433de501b9c3513/Formula/openssl.rb +/usr/local/bin/brew tap-new local/openssl +FORMULA_PATH=$(/usr/local/bin/brew extract openssl local/openssl | grep "Homebrew/Library/Taps") +/usr/local/bin/brew install $FORMULA_PATH # Set OpenSSL 1.0.2t as default -ln -sf /usr/local/Cellar/openssl/1.*/bin/openssl /usr/local/bin/openssl +ln -sf /usr/local/Cellar/openssl@1.0.2t /usr/local/Cellar/openssl +ln -sf /usr/local/Cellar/openssl/1.0.2t/bin/openssl /usr/local/bin/openssl +rm /usr/local/opt/openssl +ln -sf ../Cellar/openssl/1.0.2t /usr/local/opt/openssl # Resolve dot net core openssl dependency issue for agent # https://github.com/microsoft/azure-pipelines-agent/blob/master/docs/start/envosx.md mkdir -p /usr/local/lib/ -ln -s /usr/local/opt/openssl*/lib/libcrypto.1.0.*.dylib /usr/local/lib/ -ln -s /usr/local/opt/openssl*/lib/libssl.1.0.*.dylib /usr/local/lib/ \ No newline at end of file +ln -s /usr/local/opt/openssl@1.0.2t/lib/libcrypto.1.0.0.dylib /usr/local/lib/ +ln -s /usr/local/opt/openssl@1.0.2t/lib/libssl.1.0.0.dylib /usr/local/lib/ \ No newline at end of file diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 5d2984f6..9627e24e 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -178,7 +178,7 @@ if ($os.IsHigherThanMojave) { $markdown += New-MDNewLine # Tools -$fastlaneVersion = Run-Command "fastlane --version" | Select-String "fastlane [0-9]" | Take-Part -Part 1 +$fastlaneVersion = Run-Command "fastlane --version" | Select-String "^fastlane [0-9]" | Take-Part -Part 1 $cmakeVersion = Run-Command "cmake --version" | Select-Object -First 1 | Take-Part -Part 2 $appcenterCLIVersion = Run-Command "appcenter --version" | Take-Part -Part 2 $azureCLIVersion = Run-Command "az -v" | Select-String "^azure-cli" | Take-Part -Part 1 diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json index 74a5e61d..2190a6b4 100644 --- a/images/macos/templates/macOS-10.13.json +++ b/images/macos/templates/macOS-10.13.json @@ -32,8 +32,8 @@ "vm_name": "{{user `build_id`}}", "ssh_username": "{{user `vm_username`}}", "ssh_password": "{{user `vm_password`}}", - "CPUs": "4", - "RAM": "12288", + "CPUs": "10", + "RAM": "24576", "NestedHV": "true", "shutdown_timeout": "15m" } diff --git a/images/macos/toolsets/Toolset.Tests.ps1 b/images/macos/toolsets/Toolset.Tests.ps1 index 12bbee49..8e5b69ef 100644 --- a/images/macos/toolsets/Toolset.Tests.ps1 +++ b/images/macos/toolsets/Toolset.Tests.ps1 @@ -1,6 +1,6 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -$toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset_*.json" +$toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset-*.json" function Get-ShortVersion([System.Version] $Version) { return [System.Version]::Parse($Version).ToString(2) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 21eb61a0..c825865c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -6,9 +6,9 @@ ] }, "xamarin": { - "vsmac": "8.7.4.38", + "vsmac": "8.7.5.19", "mono-versions": [ - "6.12.0.90", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" + "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 5a8f8ee5..bab2c6f9 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -1,14 +1,14 @@ { "xcode": { - "default": "11.6", + "default": "11.7", "versions": [ - "12_beta", "11.6" + "12_beta", "11.7" ] }, "xamarin": { - "vsmac": "8.7.1.15", + "vsmac": "8.7.5.19", "mono-versions": [ - "6.12.0.90", "6.10.0.106" + "6.12.0.93", "6.10.0.106" ], "ios-versions": [ "13.20.2.2", "13.18.2.1" @@ -17,7 +17,7 @@ "6.20.2.2", "6.18.3.2" ], "android-versions": [ - "11.0.0.3", "10.3.1.4" + "11.0.2.0", "10.3.1.4" ], "bundle-default": "latest", "bundles": [ @@ -48,7 +48,7 @@ "android-30", "android-29", "android-28", "android-27" ], "build-tools": [ - "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0" + "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.1", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0" ], "extra-list": [ "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager"