diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml index ec1c1e6e438..fe5ecfd32a2 100644 --- a/scripts/azure-pipelines-complete.yml +++ b/scripts/azure-pipelines-complete.yml @@ -18,7 +18,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 - name: VM_IMAGE_WINDOWS type: object default: @@ -36,11 +36,11 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 variables: - template: azure-pipelines-variables.yml diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 24362dae600..4b1e67b72dc 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -8,7 +8,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 - name: VM_IMAGE_WINDOWS type: object default: @@ -26,7 +26,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 variables: - template: azure-pipelines-variables.yml diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index ceec0c605da..2e97f33cbb4 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -9,10 +9,10 @@ variables: PREVIEW_LABEL: 'preview' BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] BUILD_COUNTER: $[counter('global_counter', 1)] - TIZEN_LINUX_PACKAGES: libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn + TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_13' - MONO_VERSION_LINUX: '' + MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182' XCODE_VERSION: 13.2.1 VISUAL_STUDIO_VERSION: '17/pre' DOTNET_VERSION_PREVIEW: '6.0.401' diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 1bdd3839a5a..0ae2f7e9434 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -18,7 +18,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 - name: VM_IMAGE_WINDOWS type: object default: @@ -36,7 +36,7 @@ parameters: default: pool: name: Azure Pipelines - vmImage: ubuntu-18.04 + vmImage: ubuntu-20.04 variables: - template: azure-pipelines-variables.yml diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 96d5eb60c24..29a14eed511 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -80,11 +80,11 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne('${{ parameters.packages }}', '')) # make sure mono/msbuild is the correct version - - ${{ if and(ne(variables['MONO_VERSION_LINUX'], ''), eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}: + - ${{ if and(eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}: - bash: ./scripts/install-mono.sh $(MONO_VERSION_LINUX) displayName: Install Mono and MSBuild retryCountOnTaskFailure: 3 - condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) + condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''), ne(variables['MONO_VERSION_LINUX'], '')) - ${{ if endsWith(parameters.name, '_macos') }}: - bash: sudo ./scripts/select-xamarin.sh $(MONO_VERSION_MACOS) displayName: Switch to the latest Xamarin SDK diff --git a/scripts/install-mono.sh b/scripts/install-mono.sh index 446a4a7135c..65c0a4b0864 100755 --- a/scripts/install-mono.sh +++ b/scripts/install-mono.sh @@ -1,11 +1,10 @@ #!/usr/bin/env bash set -e -sudo apt remove -y mono-complete msbuild -sudo apt autoremove -y -sudo rm /etc/mono/config sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF echo "deb https://download.mono-project.com/repo/ubuntu $@ main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list sudo apt update sudo apt install -y mono-complete msbuild mono --version +sudo apt install -y gtk-sharp2 +mono --version