From d8a98cfac32f6733016443ce8a8680b9b1225466 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 05:42:37 +0200 Subject: [PATCH 01/44] Use a macOS Monterey pool --- scripts/azure-pipelines-tests.yml | 9 +++++++-- scripts/azure-pipelines-variables.yml | 10 +++++----- scripts/azure-pipelines.yml | 11 ++++++++--- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 3265a46ab06..052779d8a33 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -15,8 +15,13 @@ parameters: - name: VM_IMAGE_MAC type: object default: - name: Azure Pipelines - vmImage: macOS-10.15 + name: VSEng-VSMac-Xamarin-Shared + vmImage: VSEng-VSMac-Xamarin-Shared + demands: + - macOS.Name -equals Monterey + - macOS.Architecture -equals x64 + - Agent.HasDevices -equals False + - Agent.IsPaired -equals False - name: VM_IMAGE_LINUX type: object default: diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index 4a9e5ab0455..e549561e5bb 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -12,11 +12,11 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_7' MONO_VERSION_LINUX: '' - XCODE_VERSION: 12.4 - DOTNET_VERSION_PREVIOUS: 3.1.416 - DOTNET_VERSION: 5.0.405 - DOTNET_VERSION_PREVIEW: '6.0.200-rtm.22107.3' - DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.14.json' + XCODE_VERSION: 13.3 + DOTNET_VERSION_PREVIOUS: 3.1.417 + DOTNET_VERSION: 5.0.406 + DOTNET_VERSION_PREVIEW: '6.0.300-preview.22179.2' + DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.300/rc.1.json' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true THROW_ON_TEST_FAILURE: true diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index d84bb40ca23..91a8f291dd3 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -12,7 +12,7 @@ parameters: - name: buildExternals displayName: 'The specific native artifacts to use for this build.' type: number - default: 0 + default: 5836420 - name: VM_IMAGE_WINDOWS type: object default: @@ -21,8 +21,13 @@ parameters: - name: VM_IMAGE_MAC type: object default: - name: Azure Pipelines - vmImage: macOS-10.15 + name: VSEng-VSMac-Xamarin-Shared + vmImage: VSEng-VSMac-Xamarin-Shared + demands: + - macOS.Name -equals Monterey + - macOS.Architecture -equals x64 + - Agent.HasDevices -equals False + - Agent.IsPaired -equals False - name: VM_IMAGE_LINUX type: object default: From 89acfb4860c84ba2ad7020dd5e0e6a6d2f650eca Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 05:55:02 +0200 Subject: [PATCH 02/44] Use different machines for managed and unmanaged --- scripts/azure-pipelines-tests.yml | 8 ++++ scripts/azure-pipelines.yml | 8 ++++ scripts/azure-templates-stages.yml | 63 ++++++++++++++++-------------- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 052779d8a33..5279b033547 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -12,6 +12,11 @@ parameters: default: name: Azure Pipelines vmImage: windows-2022 + - name: VM_IMAGE_MAC_NATIVE + type: object + default: + name: Azure Pipelines + vmImage: macOS-10.15 - name: VM_IMAGE_MAC type: object default: @@ -49,5 +54,8 @@ stages: isBuildPipeline: false buildExternals: ${{ parameters.buildExternals }} VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }} + VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }} VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }} + VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC_NATIVE }} VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }} + VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }} diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 91a8f291dd3..481fb2fafd5 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -18,6 +18,11 @@ parameters: default: name: Azure Pipelines vmImage: windows-2022 + - name: VM_IMAGE_MAC_NATIVE + type: object + default: + name: Azure Pipelines + vmImage: macOS-10.15 - name: VM_IMAGE_MAC type: object default: @@ -51,5 +56,8 @@ stages: isBuildPipeline: true buildExternals: ${{ parameters.buildExternals }} VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }} + VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }} VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }} + VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC_NATIVE }} VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }} + VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }} diff --git a/scripts/azure-templates-stages.yml b/scripts/azure-templates-stages.yml index aa9a41d8822..10430b8b466 100644 --- a/scripts/azure-templates-stages.yml +++ b/scripts/azure-templates-stages.yml @@ -2,8 +2,11 @@ parameters: isBuildPipeline: true buildExternals: 0 VM_IMAGE_WINDOWS: '' + VM_IMAGE_WINDOWS_NATIVE: '' VM_IMAGE_MAC: '' + VM_IMAGE_MAC_NATIVE: '' VM_IMAGE_LINUX: '' + VM_IMAGE_LINUX_NATIVE: '' stages: - stage: prepare @@ -36,7 +39,7 @@ stages: displayName: Android x86 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-android additionalArgs: --buildarch=x86 installWindowsSdk: false @@ -47,7 +50,7 @@ stages: displayName: Android x64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-android additionalArgs: --buildarch=x64 installWindowsSdk: false @@ -58,7 +61,7 @@ stages: displayName: Android arm buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-android additionalArgs: --buildarch=arm installWindowsSdk: false @@ -69,7 +72,7 @@ stages: displayName: Android arm64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-android additionalArgs: --buildarch=arm64 installWindowsSdk: false @@ -80,7 +83,7 @@ stages: displayName: Tizen buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-tizen installWindowsSdk: false artifactName: native @@ -90,7 +93,7 @@ stages: displayName: ANGLE x86 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: ANGLE additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86 artifactName: native @@ -100,7 +103,7 @@ stages: displayName: ANGLE x64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: ANGLE additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64 artifactName: native @@ -110,7 +113,7 @@ stages: displayName: ANGLE arm buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: ANGLE additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm artifactName: native @@ -120,7 +123,7 @@ stages: displayName: ANGLE arm64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: ANGLE additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64 artifactName: native @@ -130,7 +133,7 @@ stages: displayName: UWP x86 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-uwp additionalArgs: --buildarch=x86 --skipAngle=true artifactName: native @@ -139,7 +142,7 @@ stages: name: native_uwp_x64_windows displayName: UWP x64 buildExternals: ${{ parameters.buildExternals }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-uwp additionalArgs: --buildarch=x64 --skipAngle=true artifactName: native @@ -149,7 +152,7 @@ stages: displayName: UWP arm buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-uwp additionalArgs: --buildarch=arm --skipAngle=true artifactName: native @@ -159,7 +162,7 @@ stages: displayName: UWP arm64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-uwp additionalArgs: --buildarch=arm64 --skipAngle=true artifactName: native @@ -169,7 +172,7 @@ stages: displayName: Win32 x86 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-windows additionalArgs: --buildarch=x86 artifactName: native @@ -179,7 +182,7 @@ stages: displayName: Win32 x64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-windows additionalArgs: --buildarch=x64 artifactName: native @@ -189,7 +192,7 @@ stages: displayName: Win32 arm64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-windows additionalArgs: --buildarch=arm64 artifactName: native @@ -199,7 +202,7 @@ stages: displayName: Nano Server x64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_WINDOWS}} + vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE }} target: externals-nanoserver additionalArgs: --buildarch=x64 artifactName: native @@ -215,7 +218,7 @@ stages: displayName: Android x86 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=x86 - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS) @@ -224,7 +227,7 @@ stages: displayName: Android x64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=x64 - template: azure-templates-bootstrapper.yml # Build Native Android|arm (macOS) @@ -233,7 +236,7 @@ stages: displayName: Android arm buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=arm - template: azure-templates-bootstrapper.yml # Build Native Android|arm64 (macOS) @@ -242,7 +245,7 @@ stages: displayName: Android arm64 buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-android additionalArgs: --buildarch=arm64 - template: azure-templates-bootstrapper.yml # Build Native iOS (macOS) @@ -251,7 +254,7 @@ stages: displayName: iOS buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-ios artifactName: native - template: azure-templates-bootstrapper.yml # Build Native Mac Catalyst (macOS) @@ -260,7 +263,7 @@ stages: displayName: Mac Catalyst buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-maccatalyst artifactName: native - template: azure-templates-bootstrapper.yml # Build Native macOS (macOS) @@ -269,7 +272,7 @@ stages: displayName: macOS buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-macos artifactName: native - template: azure-templates-bootstrapper.yml # Build Native tvOS (macOS) @@ -278,7 +281,7 @@ stages: displayName: tvOS buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-tvos artifactName: native - template: azure-templates-bootstrapper.yml # Build Native watchOS (macOS) @@ -287,7 +290,7 @@ stages: displayName: watchOS buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-watchos artifactName: native - template: azure-templates-bootstrapper.yml # Build Native Tizen (macOS) @@ -296,7 +299,7 @@ stages: displayName: Tizen buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_MAC }} + vmImage: ${{ parameters.VM_IMAGE_MAC_NATIVE }} target: externals-tizen condition: false # TODO: TIZEN INSTALL BUGS @@ -310,7 +313,7 @@ stages: artifactName: native buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_LINUX }} + vmImage: ${{ parameters.VM_IMAGE_LINUX_NATIVE }} builds: - name: '' - name: nodeps @@ -336,7 +339,7 @@ stages: displayName: Tizen buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_LINUX }} + vmImage: ${{ parameters.VM_IMAGE_LINUX_NATIVE }} packages: $(TIZEN_LINUX_PACKAGES) target: externals-tizen @@ -349,7 +352,7 @@ stages: parameters: buildExternals: ${{ parameters.buildExternals }} isBuildPipeline: ${{ parameters.isBuildPipeline }} - vmImage: ${{ parameters.VM_IMAGE_LINUX }} + vmImage: ${{ parameters.VM_IMAGE_LINUX_NATIVE }} artifactName: native emscripten: - 2.0.5 From 8ec4cfd35d76445bfd96a0634dcc15a1aba5ad7a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 06:54:07 +0200 Subject: [PATCH 03/44] this --- scripts/azure-templates-build.yml | 15 ++++++++++----- scripts/install-dotnet-workloads.ps1 | 8 +++----- scripts/install-dotnet.ps1 | 19 ++++++++++++++----- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 7463a5bfd42..e8936a3f653 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -54,14 +54,19 @@ jobs: sudo apt update sudo apt install -y ${{ parameters.packages }} displayName: Install additional package dependencies - condition: ne('${{ parameters.packages }}', '') + condition: and(succeeded(), 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')) }}: - bash: ./scripts/install-mono.sh $(MONO_VERSION_LINUX) displayName: Install Mono and MSBuild - ${{ if endsWith(parameters.name, '_macos') }}: - - bash: sudo $(Agent.HomeDirectory)/scripts/select-xamarin-sdk.sh $(MONO_VERSION_MACOS) + - bash: | + ls -l '/Library/Frameworks/Mono.framework/Versions' + ls -l '/Library/Frameworks/Xamarin.iOS.framework/Versions' + ls -l '/Library/Frameworks/Xamarin.Android.framework/Versions' + ls -l '/Library/Frameworks/Xamarin.Mac.framework/Versions' + sudo $(Agent.HomeDirectory)/scripts/select-xamarin-sdk.sh $(MONO_VERSION_MACOS) displayName: Switch to the latest Xamarin SDK # install extra bits for the native builds @@ -129,17 +134,17 @@ jobs: # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core - condition: ne(variables.DOTNET_VERSION_PREVIEW, '') + condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 displayName: Install Visual Studio - ${{ if not(endsWith(parameters.name, '_linux')) }}: - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $true - condition: ne(variables.DOTNET_VERSION_PREVIEW, '') + condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) displayName: Install the preview .NET Core workloads - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $false - condition: eq(variables.DOTNET_VERSION_PREVIEW, '') + condition: and(succeeded(), eq(variables.DOTNET_VERSION_PREVIEW, '')) displayName: Install the .NET Core workloads # display dotnet info - pwsh: dotnet --info diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1 index df505433977..48ec1de6916 100644 --- a/scripts/install-dotnet-workloads.ps1 +++ b/scripts/install-dotnet-workloads.ps1 @@ -1,13 +1,11 @@ Param( - [string] $InstallDir, - [string] $SourceUrl, - [boolean] $IsPreview = $true + [string] $SourceUrl, + [string] $InstallDir, + [boolean] $IsPreview = $true ) $ErrorActionPreference = 'Stop' -$env:DOTNET_ROOT="$InstallDir" - $previewFeed = 'https://api.nuget.org/v3/index.json' $previewRuntime = 'https://api.nuget.org/v3/index.json' $previewEmscripten = 'https://api.nuget.org/v3/index.json' diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index fd2697a0eb4..549cf933171 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -1,7 +1,7 @@ Param( - [string] $Version, - [string] $InstallDir, - [string] $FeedUrl = "https://dotnetbuilds.blob.core.windows.net/public" + [string] $Version, + [string] $InstallDir, + [string] $FeedUrl = "https://dotnetbuilds.blob.core.windows.net/public" ) $ErrorActionPreference = 'Stop' @@ -26,7 +26,16 @@ if ($IsMacOS) { .\dotnet-install.ps1 -Version "$Version" -InstallDir "$InstallDir" -AzureFeed "$FeedUrl" -Verbose } -Write-Host "Installed .NET Versions:" -& dotnet --list-sdks +$env:DOTNET_INSTALL_DIR=$InstallDir +$env:DOTNET_ROOT=$InstallDir +$env:DOTNET_MULTILEVEL_LOOKUP=0 + +Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; +Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; +Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; + +Write-Host "##vso[task.setvariable variable=PATH;]$InstallDir;$env:PATH"; + +& dotnet --info exit $LASTEXITCODE From 996964b2e037b3d09fced0c380fb072afd3211b2 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 07:13:52 +0200 Subject: [PATCH 04/44] this --- scripts/azure-pipelines-tests.yml | 2 +- scripts/azure-pipelines-variables.yml | 3 ++- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-build.yml | 15 +++++++-------- scripts/select-xamarin.sh | 9 +++++++++ scripts/select-xcode.sh | 7 +++++++ 6 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 scripts/select-xamarin.sh create mode 100644 scripts/select-xcode.sh diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml index 5279b033547..9991b79264c 100644 --- a/scripts/azure-pipelines-tests.yml +++ b/scripts/azure-pipelines-tests.yml @@ -16,7 +16,7 @@ parameters: type: object default: name: Azure Pipelines - vmImage: macOS-10.15 + vmImage: macos-11 - name: VM_IMAGE_MAC type: object default: diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index e549561e5bb..e80cf961c21 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -10,9 +10,10 @@ variables: BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 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 MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - MONO_VERSION_MACOS: '6_12_7' + MONO_VERSION_MACOS: '6_12_13' MONO_VERSION_LINUX: '' XCODE_VERSION: 13.3 + XCODE_VERSION_NATIVE: 13.2.1 DOTNET_VERSION_PREVIOUS: 3.1.417 DOTNET_VERSION: 5.0.406 DOTNET_VERSION_PREVIEW: '6.0.300-preview.22179.2' diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 481fb2fafd5..313f705927e 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -22,7 +22,7 @@ parameters: type: object default: name: Azure Pipelines - vmImage: macOS-10.15 + vmImage: macos-11 - name: VM_IMAGE_MAC type: object default: diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index e8936a3f653..71fb1408e00 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -61,12 +61,7 @@ jobs: - bash: ./scripts/install-mono.sh $(MONO_VERSION_LINUX) displayName: Install Mono and MSBuild - ${{ if endsWith(parameters.name, '_macos') }}: - - bash: | - ls -l '/Library/Frameworks/Mono.framework/Versions' - ls -l '/Library/Frameworks/Xamarin.iOS.framework/Versions' - ls -l '/Library/Frameworks/Xamarin.Android.framework/Versions' - ls -l '/Library/Frameworks/Xamarin.Mac.framework/Versions' - sudo $(Agent.HomeDirectory)/scripts/select-xamarin-sdk.sh $(MONO_VERSION_MACOS) + - bash: sudo ./scripts/select-xamarin.sh $(MONO_VERSION_MACOS) displayName: Switch to the latest Xamarin SDK # install extra bits for the native builds @@ -157,8 +152,12 @@ jobs: # install the mac tools - ${{ if endsWith(parameters.name, '_macos') }}: - - bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer - displayName: Switch to the latest Xcode + - ${{ if startsWith(parameters.name, 'native_') }}: + - bash: sudo ./scripts/select-xcode.sh $(XCODE_VERSION_NATIVE) + displayName: Switch to the latest Xcode + - ${{ if not(startsWith(parameters.name, 'native_')) }}: + - bash: sudo ./scripts/select-xcode.sh $(XCODE_VERSION) + displayName: Switch to the latest Xcode # install the linux tools - ${{ if and(eq(parameters.installEmsdk, 'true'), endsWith(parameters.name, '_linux')) }}: diff --git a/scripts/select-xamarin.sh b/scripts/select-xamarin.sh new file mode 100644 index 00000000000..efafcc1dd2a --- /dev/null +++ b/scripts/select-xamarin.sh @@ -0,0 +1,9 @@ +#!/bin/bash -e -o pipefail + +$mono_version=$1 + +if [ -d "$AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh" ]; then + $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $mono_version +else + echo "Skipping the switch because the script did not exist." +fi diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh new file mode 100644 index 00000000000..42cb8d5bce9 --- /dev/null +++ b/scripts/select-xcode.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e -o pipefail + +$XCODE_VERSION=$1 + +echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app' + +xcode-select --switch '/Applications/Xcode_$XCODE_VERSION.app/Contents/Developer' From f70889cb3aa5a856ae8a62c74bad22299dcbe401 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 05:29:39 +0000 Subject: [PATCH 05/44] chmod +x --- scripts/select-xamarin.sh | 0 scripts/select-xcode.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/select-xamarin.sh mode change 100644 => 100755 scripts/select-xcode.sh diff --git a/scripts/select-xamarin.sh b/scripts/select-xamarin.sh old mode 100644 new mode 100755 diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh old mode 100644 new mode 100755 From 2a0212f869562d1fdcdcf5f305000cf4a588c5a7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 07:36:42 +0200 Subject: [PATCH 06/44] oops --- scripts/select-xamarin.sh | 4 ++-- scripts/select-xcode.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/select-xamarin.sh b/scripts/select-xamarin.sh index efafcc1dd2a..05d9ecaacad 100755 --- a/scripts/select-xamarin.sh +++ b/scripts/select-xamarin.sh @@ -1,9 +1,9 @@ #!/bin/bash -e -o pipefail -$mono_version=$1 +MONO_VERSION=$1 if [ -d "$AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh" ]; then - $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $mono_version + $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $MONO_VERSION else echo "Skipping the switch because the script did not exist." fi diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh index 42cb8d5bce9..f0cd78f378f 100755 --- a/scripts/select-xcode.sh +++ b/scripts/select-xcode.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -o pipefail -$XCODE_VERSION=$1 +XCODE_VERSION=$1 echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app' From 53a4796b48b5cb0edcdfb7b4205324a2f695fd07 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 07:47:21 +0200 Subject: [PATCH 07/44] skip if installed --- scripts/install-dotnet.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 549cf933171..f242f7cab36 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -6,6 +6,12 @@ Param( $ErrorActionPreference = 'Stop' +$dotnetDll = Join-Path "$InstallDir" "sdk" "$Version" "dotnet.dll" +if (Test-Path $dotnetDll) { + Write-Host ".NET already installed." + exit 0 +} + if ($IsMacOS -or $IsLinux) { $url = "https://dot.net/v1/dotnet-install.sh" } else { From 3895074c79c3813c11700b149de0e66f73cacca3 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 07:51:23 +0200 Subject: [PATCH 08/44] always set props --- scripts/install-dotnet.ps1 | 39 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index f242f7cab36..4891b5570f5 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -9,27 +9,26 @@ $ErrorActionPreference = 'Stop' $dotnetDll = Join-Path "$InstallDir" "sdk" "$Version" "dotnet.dll" if (Test-Path $dotnetDll) { Write-Host ".NET already installed." - exit 0 -} - -if ($IsMacOS -or $IsLinux) { - $url = "https://dot.net/v1/dotnet-install.sh" -} else { - $url = "https://dot.net/v1/dotnet-install.ps1" -} - -Write-Host "Downloading .NET Installer..." -Invoke-WebRequest ` - -Uri "$url" ` - -OutFile (Split-Path $url -Leaf) - -Write-Host "Installing .NET $Version..." -if ($IsMacOS) { - & sh dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose -} elseif ($IsLinux) { - & bash dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose } else { - .\dotnet-install.ps1 -Version "$Version" -InstallDir "$InstallDir" -AzureFeed "$FeedUrl" -Verbose + if ($IsMacOS -or $IsLinux) { + $url = "https://dot.net/v1/dotnet-install.sh" + } else { + $url = "https://dot.net/v1/dotnet-install.ps1" + } + + Write-Host "Downloading .NET Installer..." + Invoke-WebRequest ` + -Uri "$url" ` + -OutFile (Split-Path $url -Leaf) + + Write-Host "Installing .NET $Version..." + if ($IsMacOS) { + & sh dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose + } elseif ($IsLinux) { + & bash dotnet-install.sh --version "$Version" --install-dir "$InstallDir" --azure-feed "$FeedUrl" --verbose + } else { + .\dotnet-install.ps1 -Version "$Version" -InstallDir "$InstallDir" -AzureFeed "$FeedUrl" -Verbose + } } $env:DOTNET_INSTALL_DIR=$InstallDir From e7e5b6495f389b76a42f22ad82963dd41d5c9595 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 08:04:08 +0200 Subject: [PATCH 09/44] logging --- scripts/install-dotnet.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 4891b5570f5..13c893f3dd4 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -31,6 +31,7 @@ if (Test-Path $dotnetDll) { } } +Write-Host "Setting install directry to '$InstallDir'..." $env:DOTNET_INSTALL_DIR=$InstallDir $env:DOTNET_ROOT=$InstallDir $env:DOTNET_MULTILEVEL_LOOKUP=0 @@ -41,6 +42,8 @@ Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; Write-Host "##vso[task.setvariable variable=PATH;]$InstallDir;$env:PATH"; +Write-Host "Checking all dotnet info..." +dir $InstallDir & dotnet --info exit $LASTEXITCODE From 84bacc5e2fdf0942d9a4729520718d4af39cbdb5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 08:17:54 +0200 Subject: [PATCH 10/44] make sure PATH is set? --- scripts/install-dotnet.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 13c893f3dd4..aba38f02372 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -31,7 +31,7 @@ if (Test-Path $dotnetDll) { } } -Write-Host "Setting install directry to '$InstallDir'..." +Write-Host "Setting install directory to '$InstallDir'..." $env:DOTNET_INSTALL_DIR=$InstallDir $env:DOTNET_ROOT=$InstallDir $env:DOTNET_MULTILEVEL_LOOKUP=0 @@ -40,10 +40,10 @@ Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; -Write-Host "##vso[task.setvariable variable=PATH;]$InstallDir;$env:PATH"; +$env:PATH = "$InstallDir;$env:PATH" +Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; Write-Host "Checking all dotnet info..." -dir $InstallDir & dotnet --info exit $LASTEXITCODE From 2bd1d23a05b3fa6742da48e3956432a31a2d7f74 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 08:28:48 +0200 Subject: [PATCH 11/44] ??? --- scripts/install-dotnet.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index aba38f02372..c90f79f8a86 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -44,6 +44,8 @@ $env:PATH = "$InstallDir;$env:PATH" Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; Write-Host "Checking all dotnet info..." +$dn = Join-Path "$InstallDir" "dotnet" +& "$dn" --info & dotnet --info exit $LASTEXITCODE From 63f3d265a9c8334be5e4f60b13769a2700f8a29a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 08:38:55 +0200 Subject: [PATCH 12/44] try this --- scripts/azure-templates-build.yml | 6 +++--- scripts/install-dotnet.ps1 | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 71fb1408e00..abb30caef62 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -130,6 +130,9 @@ jobs: - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) + # display dotnet info + - pwsh: dotnet --info + displayName: Display all the .NET information - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 @@ -141,9 +144,6 @@ jobs: - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $false condition: and(succeeded(), eq(variables.DOTNET_VERSION_PREVIEW, '')) displayName: Install the .NET Core workloads - # display dotnet info - - pwsh: dotnet --info - displayName: Display all the .NET information # select the correct/latest version of Visual Studio - ${{ if endsWith(parameters.name, '_windows') }}: diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index c90f79f8a86..9ea89d2d084 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -43,9 +43,4 @@ Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; $env:PATH = "$InstallDir;$env:PATH" Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; -Write-Host "Checking all dotnet info..." -$dn = Join-Path "$InstallDir" "dotnet" -& "$dn" --info -& dotnet --info - exit $LASTEXITCODE From 27351e3b4c9280b44998b4a6ef5ecc7a802eb087 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 08:47:35 +0200 Subject: [PATCH 13/44] madness --- scripts/install-dotnet.ps1 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 9ea89d2d084..9fae8f02b5f 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -31,16 +31,19 @@ if (Test-Path $dotnetDll) { } } -Write-Host "Setting install directory to '$InstallDir'..." -$env:DOTNET_INSTALL_DIR=$InstallDir -$env:DOTNET_ROOT=$InstallDir -$env:DOTNET_MULTILEVEL_LOOKUP=0 +# Write-Host "Setting install directory to '$InstallDir'..." +# $env:DOTNET_INSTALL_DIR=$InstallDir +# $env:DOTNET_ROOT=$InstallDir +# $env:DOTNET_MULTILEVEL_LOOKUP=0 -Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; -Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; -Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; +# Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; +# Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; +# Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; $env:PATH = "$InstallDir;$env:PATH" Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; +Write-Host "Checking all dotnet info..." +& dotnet --info + exit $LASTEXITCODE From 1131a71e65e6159deed331daa7d939cb4f4bda8d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:00:11 +0200 Subject: [PATCH 14/44] sadf --- scripts/azure-templates-build.yml | 25 +++++++++++++------------ scripts/install-dotnet.ps1 | 7 ++++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index abb30caef62..e550602c698 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,18 +114,19 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: $(DOTNET_VERSION_PREVIOUS) - performMultiLevelLookup: true - displayName: Install the previous version of .NET Core - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: $(DOTNET_VERSION) - performMultiLevelLookup: true - displayName: Install the correct version of .NET Core + - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" + # - task: UseDotNet@2 + # inputs: + # packageType: 'sdk' + # version: $(DOTNET_VERSION_PREVIOUS) + # performMultiLevelLookup: true + # displayName: Install the previous version of .NET Core + # - task: UseDotNet@2 + # inputs: + # packageType: 'sdk' + # version: $(DOTNET_VERSION) + # performMultiLevelLookup: true + # displayName: Install the correct version of .NET Core # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 9fae8f02b5f..0f26f5db7ff 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -40,10 +40,11 @@ if (Test-Path $dotnetDll) { # Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; # Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; -$env:PATH = "$InstallDir;$env:PATH" -Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; +# $env:PATH = "$InstallDir;$env:PATH" +# Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; Write-Host "Checking all dotnet info..." -& dotnet --info +& "$InstallDir/dotnet" --info +# & dotnet --info exit $LASTEXITCODE From 993a824308af21158feb6f503e41d4a7d02e1823 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:15:43 +0200 Subject: [PATCH 15/44] sxdcfvgbhjnkml, --- scripts/azure-templates-build.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index e550602c698..919d89b3c33 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -115,20 +115,12 @@ jobs: # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" - # - task: UseDotNet@2 - # inputs: - # packageType: 'sdk' - # version: $(DOTNET_VERSION_PREVIOUS) - # performMultiLevelLookup: true - # displayName: Install the previous version of .NET Core - # - task: UseDotNet@2 - # inputs: - # packageType: 'sdk' - # version: $(DOTNET_VERSION) - # performMultiLevelLookup: true - # displayName: Install the correct version of .NET Core + - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION_PREVIOUS) -InstallDir "$(Agent.ToolsDirectory)/dotnet" + displayName: Install the previous version of .NET Core + - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION) -InstallDir "$(Agent.ToolsDirectory)/dotnet" + displayName: Install the correct version of .NET Core # install the bits needed for .NET 6 builds - - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION_PREVIEW) -InstallDir "$(Agent.ToolsDirectory)/dotnet" displayName: Install the preview version of .NET Core condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) # display dotnet info From 5041821e256ac4fbef0cf15bfe3da7615a932a80 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:35:34 +0200 Subject: [PATCH 16/44] scary --- scripts/azure-templates-build.yml | 14 ++++++++++---- scripts/install-dotnet.ps1 | 2 ++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 919d89b3c33..e9e5b20ff51 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,13 +114,19 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" - - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION_PREVIOUS) -InstallDir "$(Agent.ToolsDirectory)/dotnet" + - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + - task: UseDotNet@2 + inputs: + packageType: 'sdk' + version: $(DOTNET_VERSION_PREVIOUS) displayName: Install the previous version of .NET Core - - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION) -InstallDir "$(Agent.ToolsDirectory)/dotnet" + - task: UseDotNet@2 + inputs: + packageType: 'sdk' + version: $(DOTNET_VERSION) displayName: Install the correct version of .NET Core # install the bits needed for .NET 6 builds - - pwsh: .\scripts\install-dotnet.ps1 -Version $(DOTNET_VERSION_PREVIEW) -InstallDir "$(Agent.ToolsDirectory)/dotnet" + - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) # display dotnet info diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index 0f26f5db7ff..a8bd9c0e11b 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -6,6 +6,8 @@ Param( $ErrorActionPreference = 'Stop' +dir env: + $dotnetDll = Join-Path "$InstallDir" "sdk" "$Version" "dotnet.dll" if (Test-Path $dotnetDll) { Write-Host ".NET already installed." From b567a8412185678bc6647c1a0021fe7e7adb36a5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:35:56 +0200 Subject: [PATCH 17/44] asdfsadf --- scripts/azure-templates-build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index e9e5b20ff51..3f3950cc68b 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -125,6 +125,9 @@ jobs: packageType: 'sdk' version: $(DOTNET_VERSION) displayName: Install the correct version of .NET Core + # display dotnet info + - pwsh: dotnet --info + displayName: Display all the .NET information # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core From 6898588a23ef74689429bf44f1bc2900b87d2c26 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:44:29 +0200 Subject: [PATCH 18/44] select dotnet --- scripts/azure-templates-build.yml | 4 +++- scripts/install-dotnet-workloads.ps1 | 4 ++-- scripts/select-dotnet.ps1 | 22 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 scripts/select-dotnet.ps1 diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 3f3950cc68b..44bb7dceb0e 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,7 +114,7 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" - task: UseDotNet@2 inputs: packageType: 'sdk' @@ -135,6 +135,8 @@ jobs: # display dotnet info - pwsh: dotnet --info displayName: Display all the .NET information + - pwsh: .\scripts\select-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" + displayName: Select .NET Core - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 diff --git a/scripts/install-dotnet-workloads.ps1 b/scripts/install-dotnet-workloads.ps1 index 48ec1de6916..52195dd0eec 100644 --- a/scripts/install-dotnet-workloads.ps1 +++ b/scripts/install-dotnet-workloads.ps1 @@ -11,8 +11,8 @@ $previewRuntime = 'https://api.nuget.org/v3/index.json' $previewEmscripten = 'https://api.nuget.org/v3/index.json' if ($IsPreview) { $previewFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json' - $previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6dd808ff-1/nuget/v3/index.json' - $previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json' + $previewRuntime = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-323bf2dd/nuget/v3/index.json' + $previewEmscripten = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-572aeedc/nuget/v3/index.json' } Write-Host "Installing workloads..." diff --git a/scripts/select-dotnet.ps1 b/scripts/select-dotnet.ps1 new file mode 100644 index 00000000000..651b7c95444 --- /dev/null +++ b/scripts/select-dotnet.ps1 @@ -0,0 +1,22 @@ +Param( + [string] $InstallDir +) + +$ErrorActionPreference = 'Stop' + +Write-Host "Setting install directory to '$InstallDir'..." +$env:DOTNET_INSTALL_DIR=$InstallDir +$env:DOTNET_ROOT=$InstallDir +$env:DOTNET_MULTILEVEL_LOOKUP=0 + +Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; +Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; +Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; + +$env:PATH = "$InstallDir;$env:PATH" +Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; + +Write-Host "Checking all dotnet info..." +& dotnet --info + +exit $LASTEXITCODE From 6c9793848648bc5a25d4477d40fb340e952cf540 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 09:53:26 +0200 Subject: [PATCH 19/44] dfasdf --- scripts/azure-templates-build.yml | 8 ++------ scripts/install-dotnet.ps1 | 17 +---------------- scripts/select-dotnet.ps1 | 22 ---------------------- 3 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 scripts/select-dotnet.ps1 diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 44bb7dceb0e..e39c1afb8fb 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,7 +114,6 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" - task: UseDotNet@2 inputs: packageType: 'sdk' @@ -125,9 +124,6 @@ jobs: packageType: 'sdk' version: $(DOTNET_VERSION) displayName: Install the correct version of .NET Core - # display dotnet info - - pwsh: dotnet --info - displayName: Display all the .NET information # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core @@ -135,12 +131,12 @@ jobs: # display dotnet info - pwsh: dotnet --info displayName: Display all the .NET information - - pwsh: .\scripts\select-dotnet.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" - displayName: Select .NET Core + # install VS - ${{ if endsWith(parameters.name, '_windows') }}: - ${{ if eq(parameters.installPreviewVs, 'true') }}: - pwsh: .\scripts\install-vs.ps1 displayName: Install Visual Studio + # install workloads - ${{ if not(endsWith(parameters.name, '_linux')) }}: - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $true condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, '')) diff --git a/scripts/install-dotnet.ps1 b/scripts/install-dotnet.ps1 index a8bd9c0e11b..a1aaeeb73b2 100644 --- a/scripts/install-dotnet.ps1 +++ b/scripts/install-dotnet.ps1 @@ -6,8 +6,6 @@ Param( $ErrorActionPreference = 'Stop' -dir env: - $dotnetDll = Join-Path "$InstallDir" "sdk" "$Version" "dotnet.dll" if (Test-Path $dotnetDll) { Write-Host ".NET already installed." @@ -33,20 +31,7 @@ if (Test-Path $dotnetDll) { } } -# Write-Host "Setting install directory to '$InstallDir'..." -# $env:DOTNET_INSTALL_DIR=$InstallDir -# $env:DOTNET_ROOT=$InstallDir -# $env:DOTNET_MULTILEVEL_LOOKUP=0 - -# Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; -# Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; -# Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; - -# $env:PATH = "$InstallDir;$env:PATH" -# Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; - Write-Host "Checking all dotnet info..." -& "$InstallDir/dotnet" --info -# & dotnet --info +& dotnet --info exit $LASTEXITCODE diff --git a/scripts/select-dotnet.ps1 b/scripts/select-dotnet.ps1 deleted file mode 100644 index 651b7c95444..00000000000 --- a/scripts/select-dotnet.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -Param( - [string] $InstallDir -) - -$ErrorActionPreference = 'Stop' - -Write-Host "Setting install directory to '$InstallDir'..." -$env:DOTNET_INSTALL_DIR=$InstallDir -$env:DOTNET_ROOT=$InstallDir -$env:DOTNET_MULTILEVEL_LOOKUP=0 - -Write-Host "##vso[task.setvariable variable=DOTNET_INSTALL_DIR;]$InstallDir"; -Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$InstallDir"; -Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP;]0"; - -$env:PATH = "$InstallDir;$env:PATH" -Write-Host "##vso[task.setvariable variable=PATH;]$env:PATH"; - -Write-Host "Checking all dotnet info..." -& dotnet --info - -exit $LASTEXITCODE From bb100f9fab1d701db2f8a526ab0ea00cd4f4e930 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 10:05:46 +0200 Subject: [PATCH 20/44] quotes --- scripts/select-xcode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh index f0cd78f378f..1c37fbb7a0c 100755 --- a/scripts/select-xcode.sh +++ b/scripts/select-xcode.sh @@ -2,6 +2,6 @@ XCODE_VERSION=$1 -echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app' +echo "##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app" -xcode-select --switch '/Applications/Xcode_$XCODE_VERSION.app/Contents/Developer' +xcode-select --switch "/Applications/Xcode_$XCODE_VERSION.app/Contents/Developer" From fa6223af316b67d7db63ec17191232f39a028294 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 15:28:41 +0200 Subject: [PATCH 21/44] hmmm --- scripts/azure-templates-build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index e39c1afb8fb..5fedd162edd 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,16 +114,23 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: + - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" - task: UseDotNet@2 inputs: packageType: 'sdk' version: $(DOTNET_VERSION_PREVIOUS) displayName: Install the previous version of .NET Core + # display dotnet info + - pwsh: dotnet --info + displayName: Display all the .NET information - task: UseDotNet@2 inputs: packageType: 'sdk' version: $(DOTNET_VERSION) displayName: Install the correct version of .NET Core + # display dotnet info + - pwsh: dotnet --info + displayName: Display all the .NET information # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core From d233b1d8fb71ea5cbe0e46e8b2ca7c7faf183afa Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 16:14:55 +0200 Subject: [PATCH 22/44] /Applications/ --- scripts/azure-templates-build.yml | 10 +++------- scripts/select-xcode.sh | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml index 5fedd162edd..2fa38d4380d 100644 --- a/scripts/azure-templates-build.yml +++ b/scripts/azure-templates-build.yml @@ -114,23 +114,19 @@ jobs: displayName: Install Android API 31 (v12) # install the bits needed for .NET - ${{ if eq(parameters.installDotNet, 'true') }}: - - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" + - ${{ if endsWith(parameters.name, '_macos') }}: + - pwsh: Remove-Item -Recurse -Force "$env:AGENT_TOOLSDIRECTORY/dotnet" + displayName: Cleanup existing versions of .NET Core - task: UseDotNet@2 inputs: packageType: 'sdk' version: $(DOTNET_VERSION_PREVIOUS) displayName: Install the previous version of .NET Core - # display dotnet info - - pwsh: dotnet --info - displayName: Display all the .NET information - task: UseDotNet@2 inputs: packageType: 'sdk' version: $(DOTNET_VERSION) displayName: Install the correct version of .NET Core - # display dotnet info - - pwsh: dotnet --info - displayName: Display all the .NET information # install the bits needed for .NET 6 builds - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET Core diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh index 1c37fbb7a0c..d7e6d45d3ed 100755 --- a/scripts/select-xcode.sh +++ b/scripts/select-xcode.sh @@ -2,6 +2,8 @@ XCODE_VERSION=$1 +ls -l /Applications/Xcode* + echo "##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app" xcode-select --switch "/Applications/Xcode_$XCODE_VERSION.app/Contents/Developer" From 82b1cdf55b21764be98a480af436d76c27b5784d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 31 Mar 2022 16:32:07 +0200 Subject: [PATCH 23/44] asdf --- scripts/azure-pipelines-variables.yml | 2 +- scripts/select-xcode.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index e80cf961c21..96fcf3034fe 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -12,7 +12,7 @@ variables: MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build MONO_VERSION_MACOS: '6_12_13' MONO_VERSION_LINUX: '' - XCODE_VERSION: 13.3 + XCODE_VERSION: 13.3.0 XCODE_VERSION_NATIVE: 13.2.1 DOTNET_VERSION_PREVIOUS: 3.1.417 DOTNET_VERSION: 5.0.406 diff --git a/scripts/select-xcode.sh b/scripts/select-xcode.sh index d7e6d45d3ed..9f7e4591024 100755 --- a/scripts/select-xcode.sh +++ b/scripts/select-xcode.sh @@ -2,7 +2,7 @@ XCODE_VERSION=$1 -ls -l /Applications/Xcode* +ls /Applications/Xcode* echo "##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]/Applications/Xcode_$XCODE_VERSION.app" From 29de733cadcc9adfb4f5f1e10affb32a1ef7f75a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 1 Apr 2022 00:07:53 +0200 Subject: [PATCH 24/44] Use new APIs --- VERSIONS.txt | 2 +- samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs | 1 + .../SkiaSharpSample/Platforms/Windows/App.xaml.cs | 7 ------- .../Maui/SkiaSharpSample/SkiaSharpSample.csproj | 12 +----------- source/SkiaSharp.Build.targets | 2 +- .../SKCanvasViewRendererBase.cs | 6 +++--- .../SKGLViewRendererBase.cs | 4 ++-- .../SkiaSharp.Views.Forms.Shared/SKImageSource.cs | 2 ++ .../AppHostBuilderExtensions.cs | 8 +++----- .../SKCanvasView/SKCanvasViewHandler.Android.cs | 2 +- .../SKCanvasView/SKCanvasViewHandler.Windows.cs | 2 +- .../Handlers/SKCanvasView/SKCanvasViewHandler.iOS.cs | 2 +- .../SkiaSharp.Views.UWP/UWPExtensions.cs | 2 +- 13 files changed, 18 insertions(+), 34 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 5fb1b34f195..2020ba6641a 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -22,7 +22,7 @@ System.IO.UnmanagedMemoryStream release 4.3.0 System.Drawing.Common release 4.5.1 SharpVk release 0.4.2 Uno.UI release 4.0.8 -Microsoft.WindowsAppSDK release 1.0.0 +Microsoft.WindowsAppSDK release 1.0.1 Microsoft.Maui.Graphics release 6.0.200-preview.12.852 Microsoft.Windows.SDK.NET.Ref release 10.0.18362.22 Microsoft.AspNetCore.Components.Web release 6.0.0 diff --git a/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs b/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs index a57d7612aed..b83ef70d373 100644 --- a/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs +++ b/samples/Basic/Maui/SkiaSharpSample/MauiProgram.cs @@ -2,6 +2,7 @@ using Microsoft.Maui.Hosting; using Microsoft.Maui.Controls.Hosting; using SkiaSharp.Views.Maui.Controls.Hosting; +using Microsoft.Maui.Controls.Compatibility.Hosting; namespace SkiaSharpSample { diff --git a/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs b/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs index 616eb04f66d..20098026ce4 100644 --- a/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs +++ b/samples/Basic/Maui/SkiaSharpSample/Platforms/Windows/App.xaml.cs @@ -12,12 +12,5 @@ public App() } protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); - - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - base.OnLaunched(args); - - Microsoft.Maui.Essentials.Platform.OnLaunched(args); - } } } diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj index 9d84a75d7a0..660e801413b 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -18,7 +18,7 @@ 14.2 14.0 21.0 - 10.0.18362.0 + 10.0.17763.0 @@ -37,11 +37,6 @@ - - - - - libSkiaSharp.dll @@ -49,11 +44,6 @@ - - WinExe - win10-x64 - - diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index 1efc4d0c980..1301709c05e 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -23,7 +23,7 @@ 10.14 13.1 21.0 - 10.0.18362.0 + 10.0.17763.0