diff --git a/Make.config b/Make.config index f155acdc3665..d18677dd0f16 100644 --- a/Make.config +++ b/Make.config @@ -252,11 +252,6 @@ MIN_MONO_VERSION=6.12.0.179 MAX_MONO_VERSION=6.12.99 MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.179.macos10.xamarin.universal.pkg -# ObjectiveSharpie min/max versions -MIN_SHARPIE_VERSION=3.5.126 -MAX_SHARPIE_VERSION=3.5.999 -MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/0f25c412-fde2-408f-a3e6-13facf6d1484/33033e7ce78cbea9f876dd4e75eabc60/objectivesharpie-3.5.126.pkg - # Minimum OSX versions for building XI/XM MIN_OSX_BUILD_VERSION=15.3 diff --git a/system-dependencies.sh b/system-dependencies.sh index fbf8a318718e..9b1041ff47e2 100755 --- a/system-dependencies.sh +++ b/system-dependencies.sh @@ -13,7 +13,6 @@ if [[ "$(uname -s)" == "Linux" ]]; then IGNORE_XCODE_COMPONENTS=1 IGNORE_MONO=1 IGNORE_VISUAL_STUDIO=1 - IGNORE_SHARPIE=1 IGNORE_SIMULATORS=1 IGNORE_OLD_SIMULATORS=1 IGNORE_7Z=1 @@ -30,7 +29,6 @@ PROVISION_DOWNLOAD_DIR=/tmp/x-provisioning SUDO=sudo VERBOSE= -OPTIONAL_SHARPIE=1 OPTIONAL_SIMULATORS=1 OPTIONAL_OLD_SIMULATORS=1 @@ -84,12 +82,6 @@ while ! test -z $1; do unset IGNORE_PYTHON3 shift ;; - --provision-sharpie) - PROVISION_SHARPIE=1 - unset OPTIONAL_SHARPIE - unset IGNORE_SHARPIE - shift - ;; --provision-simulators) PROVISION_SIMULATORS=1 unset OPTIONAL_SIMULATORS @@ -128,8 +120,6 @@ while ! test -z $1; do unset IGNORE_7Z PROVISION_HOMEBREW=1 unset IGNORE_HOMEBREW - PROVISION_SHARPIE=1 - unset IGNORE_SHARPIE PROVISION_SIMULATORS=1 unset IGNORE_SIMULATORS PROVISION_OLD_SIMULATORS=1 @@ -153,7 +143,6 @@ while ! test -z $1; do IGNORE_XCODE=1 IGNORE_7Z=1 IGNORE_HOMEBREW=1 - IGNORE_SHARPIE=1 IGNORE_SIMULATORS=1 IGNORE_PYTHON3=1 IGNORE_DOTNET=1 @@ -194,15 +183,6 @@ while ! test -z $1; do IGNORE_7Z=1 shift ;; - --ignore-sharpie) - IGNORE_SHARPIE=1 - shift - ;; - --enforce-sharpie) - unset IGNORE_SHARPIE - unset OPTIONAL_SHARPIE - shift - ;; --ignore-simulators) IGNORE_SIMULATORS=1 shift @@ -1005,87 +985,6 @@ IFS=' IFS=$IFS_tmp } -function install_objective_sharpie () { - local SHARPIE_URL=$(grep MIN_SHARPIE_URL= Make.config | sed 's/.*=//') - local MIN_SHARPIE_VERSION=$(grep MIN_SHARPIE_VERSION= Make.config | sed 's/.*=//') - - if test -z "$SHARPIE_URL"; then - fail "No MIN_SHARPIE_URL set in Make.config, cannot provision Objective Sharpie" - return - fi - - mkdir -p "$PROVISION_DOWNLOAD_DIR" - log "Downloading Objective Sharpie $MIN_SHARPIE_VERSION from $SHARPIE_URL to $PROVISION_DOWNLOAD_DIR..." - local SHARPIE_NAME=$(basename "$SHARPIE_URL") - local SHARPIE_PKG=$PROVISION_DOWNLOAD_DIR/$SHARPIE_NAME - curl -L "$SHARPIE_URL" > "$SHARPIE_PKG" - - log "Installing Objective-Sharpie $MIN_SHARPIE_VERSION from $SHARPIE_URL..." - sudo installer -pkg "$SHARPIE_PKG" -target / - - rm -f "$SHARPIE_PKG" -} - -function check_objective_sharpie () { - if ! test -z $IGNORE_SHARPIE; then return; fi - - SHARPIE_URL=$(grep MIN_SHARPIE_URL= Make.config | sed 's/.*=//') - MIN_SHARPIE_VERSION=$(grep MIN_SHARPIE_VERSION= Make.config | sed 's/.*=//') - MAX_SHARPIE_VERSION=$(grep MAX_SHARPIE_VERSION= Make.config | sed 's/.*=//') - - if ! test -f /Library/Frameworks/ObjectiveSharpie.framework/Versions/Current/Version; then - if ! test -z "$PROVISION_SHARPIE"; then - install_objective_sharpie - ACTUAL_SHARPIE_VERSION=$(cat /Library/Frameworks/ObjectiveSharpie.framework/Versions/Current/Version) - else - if test -z $OPTIONAL_SHARPIE; then - fail "You must install Objective Sharpie, at least $MIN_SHARPIE_VERSION (no Objective Sharpie found). You can download it from $SHARPIE_URL" - fail "Alternatively you can ${COLOR_MAGENTA}export IGNORE_SHARPIE=1${COLOR_RED} to skip this check." - else - warn "You do not have Objective Sharpie installed (should be at least $MIN_SHARPIE_VERSION). You can download it from $SHARPIE_URL" - fi - return - fi - else - ACTUAL_SHARPIE_VERSION=$(cat /Library/Frameworks/ObjectiveSharpie.framework/Versions/Current/Version) - if ! is_at_least_version "$ACTUAL_SHARPIE_VERSION" "$MIN_SHARPIE_VERSION"; then - if ! test -z "$PROVISION_SHARPIE"; then - install_objective_sharpie - ACTUAL_SHARPIE_VERSION=$(cat /Library/Frameworks/ObjectiveSharpie.framework/Versions/Current/Version) - else - if test -z $OPTIONAL_SHARPIE; then - fail "You must have at least Objective Sharpie $MIN_SHARPIE_VERSION, found $ACTUAL_SHARPIE_VERSION. You can download it from $SHARPIE_URL" - fail "Alternatively you can ${COLOR_MAGENTA}export IGNORE_SHARPIE=1${COLOR_RED} to skip this check." - else - warn "You do not have have at least Objective Sharpie $MIN_SHARPIE_VERSION (found $ACTUAL_SHARPIE_VERSION). You can download it from $SHARPIE_URL" - fi - return - fi - elif [[ "$ACTUAL_SHARPIE_VERSION" == "$MAX_SHARPIE_VERSION" ]]; then - : # this is ok - elif is_at_least_version "$ACTUAL_SHARPIE_VERSION" "$MAX_SHARPIE_VERSION"; then - if ! test -z "$PROVISION_SHARPIE"; then - install_objective_sharpie - ACTUAL_SHARPIE_VERSION=$(cat /Library/Frameworks/ObjectiveSharpie.framework/Versions/Current/Version) - else - if test -z $OPTIONAL_SHARPIE; then - fail "Your Objective Sharpie version is too new, max version is $MAX_SHARPIE_VERSION, found $ACTUAL_SHARPIE_VERSION. We recommend you download $SHARPIE_URL" - fail "Alternatively you can ${COLOR_MAGENTA}export IGNORE_SHARPIE=1${COLOR_RED} to skip this check." - else - warn "You do not have have at most Objective Sharpie $MAX_SHARPIE_VERSION (found $ACTUAL_SHARPIE_VERSION). We recommend you download $SHARPIE_URL" - fi - return - fi - fi - fi - - if test -z $OPTIONAL_SHARPIE; then - ok "Found Objective Sharpie $ACTUAL_SHARPIE_VERSION (at least $MIN_SHARPIE_VERSION and not more than $MAX_SHARPIE_VERSION is required)" - else - ok "Found Objective Sharpie $ACTUAL_SHARPIE_VERSION (at least $MIN_SHARPIE_VERSION and not more than $MAX_SHARPIE_VERSION is recommended)" - fi -} - function check_old_simulators () { if test -n "$IGNORE_OLD_SIMULATORS"; then return; fi @@ -1157,7 +1056,6 @@ check_yamllint check_python3 check_mono check_7z -check_objective_sharpie check_old_simulators if test -z "$IGNORE_DOTNET"; then if test -f /usr/local/share/dotnet/dotnet; then diff --git a/tests/xtro-sharpie/README.md b/tests/xtro-sharpie/README.md index 37d3171d7567..ed93da0166a5 100644 --- a/tests/xtro-sharpie/README.md +++ b/tests/xtro-sharpie/README.md @@ -123,6 +123,4 @@ Anything we do not check but for which data is available, e.g. ## Notes -* To develop you need to install ObjectiveSharpie. You can install the required version of ObjectiveSharpie by executing `./system-dependencies.sh --provision-sharpie` in this repository's root directory. - * You can use the `gen-[platform]` or `gen-all` target of the `Makefile` to generate C# code for all the API from the headers. You can then copy/paste from the (large) files to create the missing bindings; diff --git a/tools/devops/Makefile b/tools/devops/Makefile index 873bc40bfc4b..04f5be9c5da2 100644 --- a/tools/devops/Makefile +++ b/tools/devops/Makefile @@ -6,7 +6,6 @@ provision-shared.csx: provision-shared.in.csx Makefile $(TOP)/Make.config -e 's#@XCODE_XIP_NAME@#$(notdir $(XCODE_URL))#g' \ -e 's#@XCODE_ROOT_PATH@#$(XCODE_DEVELOPER_ROOT)#g' \ -e 's#@MONO_PACKAGE@#$(MIN_MONO_URL)#g' \ - -e 's#@MIN_SHARPIE_URL@#$(MIN_SHARPIE_URL)#g' \ $< > $@ LocProject.json: LocProject.json.in Makefile $(TOP)/Make.config diff --git a/tools/devops/automation/templates/windows/reserve-mac.yml b/tools/devops/automation/templates/windows/reserve-mac.yml index 5596e29d0e0a..d725d929cdae 100644 --- a/tools/devops/automation/templates/windows/reserve-mac.yml +++ b/tools/devops/automation/templates/windows/reserve-mac.yml @@ -107,7 +107,7 @@ steps: github_token: ${{ parameters.gitHubToken }} timeoutInMinutes: 250 -- bash: $(Build.SourcesDirectory)/$(BUILD_REPOSITORY_TITLE)/system-dependencies.sh --ignore-mono --ignore-visual-studio --ignore-mono --ignore-sharpie --ignore-shellcheck --ignore-yamllint --provision-simulators --ignore-xcode-components +- bash: $(Build.SourcesDirectory)/$(BUILD_REPOSITORY_TITLE)/system-dependencies.sh --ignore-mono --ignore-visual-studio --ignore-mono --ignore-shellcheck --ignore-yamllint --provision-simulators --ignore-xcode-components displayName: 'Provision simulators' timeoutInMinutes: 250 diff --git a/tools/devops/build-provisioning.csx b/tools/devops/build-provisioning.csx index de6a84226d26..63db211634b8 100644 --- a/tools/devops/build-provisioning.csx +++ b/tools/devops/build-provisioning.csx @@ -3,6 +3,5 @@ if (!ProvisionXcode ()) return 1; ProvisionMono (); -ProvisionSharpie (); ProvisionBrewPackages (); SetDefaultXcodeInVSMac (); diff --git a/tools/devops/provision-shared.in.csx b/tools/devops/provision-shared.in.csx index b182f02ceff5..9b16fe2089ca 100644 --- a/tools/devops/provision-shared.in.csx +++ b/tools/devops/provision-shared.in.csx @@ -109,7 +109,3 @@ void ProvisionMono () Item ("@MONO_PACKAGE@"); } -void ProvisionSharpie () -{ - Item ("@MIN_SHARPIE_URL@"); -}