From 365788d9799efb8e58520b4bcdb09c79455b4198 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 18 May 2021 05:17:00 +0200 Subject: [PATCH 01/19] Use maui-check and install net6 --- cake/msbuild.cake | 5 ++++- scripts/azure-templates-bootstrapper.yml | 26 ++++++++++++++---------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/cake/msbuild.cake b/cake/msbuild.cake index 8e994844503..e680f842bb1 100644 --- a/cake/msbuild.cake +++ b/cake/msbuild.cake @@ -5,7 +5,10 @@ DirectoryPath OUTPUT_SPECIAL_NUGETS_PATH = MakeAbsolute(ROOT_PATH.Combine("outpu var NUGETS_SOURCES = new [] { OUTPUT_NUGETS_PATH.FullPath, "https://api.nuget.org/v3/index.json", - "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json", + "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json", + "https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json", + "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", }; void RunNuGetRestorePackagesConfig(FilePath sln) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index f030fbac9fd..d74755ac97a 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -15,7 +15,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '' # the build number to download externals from + buildExternals: '4770100' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build @@ -26,17 +26,17 @@ parameters: installEmsdk: false # whether or not to install the Emscripten SDK jobs: -# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: -# - template: azure-templates-download.yml -# parameters: -# name: ${{ parameters.name }} -# displayName: ${{ parameters.displayName }} -# vmImage: ${{ parameters.vmImage }} -# condition: ${{ parameters.condition }} -# postBuildSteps: ${{ parameters.postBuildSteps }} -# buildExternals: ${{ parameters.buildExternals }} +- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: + - template: azure-templates-download.yml + parameters: + name: ${{ parameters.name }} + displayName: ${{ parameters.displayName }} + vmImage: ${{ parameters.vmImage }} + condition: ${{ parameters.condition }} + postBuildSteps: ${{ parameters.postBuildSteps }} + buildExternals: ${{ parameters.buildExternals }} -# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: +- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} timeoutInMinutes: 120 @@ -111,6 +111,10 @@ jobs: version: $(DOTNET_VERSION) performMultiLevelLookup: true displayName: Install the correct version of .NET Core + - pwsh: dotnet tool update --global redth.net.maui.check + displayName: Install maui-check + - pwsh: maui-check --dev --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac + displayName: Install the dev version of .NET # install the mac tools - ${{ if endsWith(parameters.name, '_macos') }}: From ce332962b28b63d711e035b8504b71fe860b9fd9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 18 May 2021 05:20:13 +0200 Subject: [PATCH 02/19] Install .net 6 --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 20e35251702..89da73dbffa 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,7 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 5.0.202 + DOTNET_VERSION: 6.0.100-preview.4.21255.9 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 From 2fd8cbc62bccd5ec3d3eca613689cbee0b68e80d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 18 May 2021 17:13:15 +0200 Subject: [PATCH 03/19] do 5.0 --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 89da73dbffa..20e35251702 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,7 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 6.0.100-preview.4.21255.9 + DOTNET_VERSION: 5.0.202 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 From 8f006dac2ae0909b3480d2a32c1e582e487ab9fd Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 05:28:44 +0200 Subject: [PATCH 04/19] Revert "do 5.0" This reverts commit 2fd8cbc62bccd5ec3d3eca613689cbee0b68e80d. --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 20e35251702..89da73dbffa 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,7 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 5.0.202 + DOTNET_VERSION: 6.0.100-preview.4.21255.9 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 From a1ec4e318b03b11ec60a3c93a5aa769312dfe868 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 05:29:34 +0200 Subject: [PATCH 05/19] includePreviewVersions --- scripts/azure-templates-bootstrapper.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index d74755ac97a..d67f71fd7bd 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -110,11 +110,12 @@ jobs: packageType: 'sdk' version: $(DOTNET_VERSION) performMultiLevelLookup: true + includePreviewVersions: true displayName: Install the correct version of .NET Core - - pwsh: dotnet tool update --global redth.net.maui.check - displayName: Install maui-check - - pwsh: maui-check --dev --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac - displayName: Install the dev version of .NET + # - pwsh: dotnet tool update --global redth.net.maui.check + # displayName: Install maui-check + # - pwsh: maui-check --dev --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac + # displayName: Install the dev version of .NET # install the mac tools - ${{ if endsWith(parameters.name, '_macos') }}: From a0820318e6ee45baea2fc31a04ed4f7ce8c64769 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 05:46:56 +0200 Subject: [PATCH 06/19] try p3 --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 89da73dbffa..1002daa2c35 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,7 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 6.0.100-preview.4.21255.9 + DOTNET_VERSION: 6.0.0-preview.3 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 From ed631c62de6dd97c3a183a8712d1f8790f78fd84 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 05:53:31 +0200 Subject: [PATCH 07/19] sdfsadf --- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-bootstrapper.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 1002daa2c35..89da73dbffa 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,7 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 6.0.0-preview.3 + DOTNET_VERSION: 6.0.100-preview.4.21255.9 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index d67f71fd7bd..8d809a33d53 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -105,6 +105,8 @@ jobs: version: $(DOTNET_VERSION_PREVIOUS) performMultiLevelLookup: true displayName: Install the previous version of .NET Core + - pwsh: dotnet --list-sdks + displayName: Install LLVM - task: UseDotNet@2 inputs: packageType: 'sdk' From 10dd33fe3055b72e3bce29af58ab89c8c13e4cf4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 06:07:07 +0200 Subject: [PATCH 08/19] Use the script --- scripts/azure-templates-bootstrapper.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 8d809a33d53..dc6b3386e0a 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -105,15 +105,18 @@ jobs: version: $(DOTNET_VERSION_PREVIOUS) performMultiLevelLookup: true displayName: Install the previous version of .NET Core - - pwsh: dotnet --list-sdks - displayName: Install LLVM - - task: UseDotNet@2 - inputs: - packageType: 'sdk' - version: $(DOTNET_VERSION) - performMultiLevelLookup: true - includePreviewVersions: true - displayName: Install the correct version of .NET Core + - ${{ if endsWith(parameters.name, '_windows') }}: + - pwsh: | + Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1 + .\dotnet-install.ps1 -Version $env:DOTNET_VERSION -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose + dotnet --list-sdks + displayName: Install the correct version of .NET Core + - ${{ if not(endsWith(parameters.name, '_windows')) }}: + - bash: | + curl -L https://dot.net/v1/dotnet-install.sh > dotnet-install.sh + sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + dotnet --list-sdks + displayName: Install the correct version of .NET Core # - pwsh: dotnet tool update --global redth.net.maui.check # displayName: Install maui-check # - pwsh: maui-check --dev --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac From 4637cf1ee068f17c0bb309bb562f0de873026431 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 06:22:19 +0200 Subject: [PATCH 09/19] try that --- scripts/azure-templates-bootstrapper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index dc6b3386e0a..4c64995aa05 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -113,7 +113,7 @@ jobs: displayName: Install the correct version of .NET Core - ${{ if not(endsWith(parameters.name, '_windows')) }}: - bash: | - curl -L https://dot.net/v1/dotnet-install.sh > dotnet-install.sh + curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose dotnet --list-sdks displayName: Install the correct version of .NET Core From c7cc8a8a0109ebcc2cab76d7ac3d69f08f7ff7be Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 06:46:59 +0200 Subject: [PATCH 10/19] bash --- scripts/azure-templates-bootstrapper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 4c64995aa05..eb0f899f693 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -114,7 +114,7 @@ jobs: - ${{ if not(endsWith(parameters.name, '_windows')) }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh - sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + bash dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose dotnet --list-sdks displayName: Install the correct version of .NET Core # - pwsh: dotnet tool update --global redth.net.maui.check From f3f701f6357d0190d9ffa8734bcadc32b52819c5 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 06:47:38 +0200 Subject: [PATCH 11/19] asdf --- scripts/azure-templates-bootstrapper.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index eb0f899f693..7f16b6bc1cd 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -111,7 +111,13 @@ jobs: .\dotnet-install.ps1 -Version $env:DOTNET_VERSION -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose dotnet --list-sdks displayName: Install the correct version of .NET Core - - ${{ if not(endsWith(parameters.name, '_windows')) }}: + - ${{ if not(endsWith(parameters.name, '_macos')) }}: + - bash: | + curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh + sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + dotnet --list-sdks + displayName: Install the correct version of .NET Core + - ${{ if not(endsWith(parameters.name, '_linux')) }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh bash dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose From 38785ef4855e840bc5c681e5f93ffd55ff803062 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 06:57:22 +0200 Subject: [PATCH 12/19] dy=uh --- scripts/azure-templates-bootstrapper.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 7f16b6bc1cd..d55ad50a739 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -111,13 +111,13 @@ jobs: .\dotnet-install.ps1 -Version $env:DOTNET_VERSION -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose dotnet --list-sdks displayName: Install the correct version of .NET Core - - ${{ if not(endsWith(parameters.name, '_macos')) }}: + - ${{ if endsWith(parameters.name, '_macos') }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose dotnet --list-sdks displayName: Install the correct version of .NET Core - - ${{ if not(endsWith(parameters.name, '_linux')) }}: + - ${{ if endsWith(parameters.name, '_linux') }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh bash dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose From b9c73cdf0802bdbb4cc51dd905ee3580f17f6670 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 07:15:25 +0200 Subject: [PATCH 13/19] this --- scripts/azure-pipelines.yml | 4 +++- scripts/azure-templates-bootstrapper.yml | 27 +++++++++++++++--------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 89da73dbffa..12cae30c805 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -24,7 +24,9 @@ variables: MONO_VERSION_LINUX: '' XCODE_VERSION: 12.4 DOTNET_VERSION_PREVIOUS: 3.1.408 - DOTNET_VERSION: 6.0.100-preview.4.21255.9 + DOTNET_VERSION: 5.0.202 + DOTNET_VERSION_PREVIEW: 6.0.100-preview.4.21255.9 + MAUI_CHECK_MANIFEST: https://github.com/Redth/dotnet-maui-check/blob/87d70d2031de15948522f1b3b361a1a24e5c3172/manifests/maui-dev.manifest.json CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index d55ad50a739..98f64eeaa4f 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -105,28 +105,35 @@ jobs: 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 current version of .NET Core - ${{ if endsWith(parameters.name, '_windows') }}: - pwsh: | Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1 - .\dotnet-install.ps1 -Version $env:DOTNET_VERSION -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose + .\dotnet-install.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose dotnet --list-sdks - displayName: Install the correct version of .NET Core + displayName: Install the preview version of .NET Core - ${{ if endsWith(parameters.name, '_macos') }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh - sh dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + sh dotnet-install.sh --version $DOTNET_VERSION_PREVIEW --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose dotnet --list-sdks - displayName: Install the correct version of .NET Core + displayName: Install the preview version of .NET Core - ${{ if endsWith(parameters.name, '_linux') }}: - bash: | curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh - bash dotnet-install.sh --version $DOTNET_VERSION --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + bash dotnet-install.sh --version $DOTNET_VERSION_PREVIEW --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose dotnet --list-sdks - displayName: Install the correct version of .NET Core - # - pwsh: dotnet tool update --global redth.net.maui.check - # displayName: Install maui-check - # - pwsh: maui-check --dev --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac - # displayName: Install the dev version of .NET + displayName: Install the preview version of .NET Core + - ${{ if not(endsWith(parameters.name, '_linux')) }}: + - pwsh: dotnet tool update --global redth.net.maui.check + displayName: Install maui-check + - pwsh: maui-check --ci --fix --non-interactive --skip androidsdk --skip xcode --skip vswin --skip vsmac --manifest $(MAUI_CHECK_MANIFEST) + displayName: Install the dev version of .NET workloads # install the mac tools - ${{ if endsWith(parameters.name, '_macos') }}: From 1e408217507377a9796fcbb72957d289adf7aefc Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 19 May 2021 15:13:15 +0200 Subject: [PATCH 14/19] oops --- scripts/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 12cae30c805..ee3b6f2d058 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -26,7 +26,7 @@ variables: DOTNET_VERSION_PREVIOUS: 3.1.408 DOTNET_VERSION: 5.0.202 DOTNET_VERSION_PREVIEW: 6.0.100-preview.4.21255.9 - MAUI_CHECK_MANIFEST: https://github.com/Redth/dotnet-maui-check/blob/87d70d2031de15948522f1b3b361a1a24e5c3172/manifests/maui-dev.manifest.json + MAUI_CHECK_MANIFEST: https://raw.githubusercontent.com/Redth/dotnet-maui-check/87d70d2031de15948522f1b3b361a1a24e5c3172/manifests/maui-dev.manifest.json CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 VM_IMAGE_WINDOWS_PREVIOUS: vs2017-win2016 From bf4ac30b7a0bccaaed1804bc68505f361569cf6f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 20 May 2021 22:49:30 +0200 Subject: [PATCH 15/19] Verbose run --- build.cake | 3 ++- tests/SkiaSharp.Wasm.Tests.sln | 26 +++++++++++++++++++++- utils/WasmTestRunner/WasmTestRunner.csproj | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/build.cake b/build.cake index 1569e842088..7a1e7d522e1 100644 --- a/build.cake +++ b/build.cake @@ -330,7 +330,8 @@ Task ("tests-wasm") DotNetCoreRun("./utils/WasmTestRunner/WasmTestRunner.csproj", "http://localhost:8000/ " + "-o ./tests/SkiaSharp.Wasm.Tests/TestResults/ " + - (string.IsNullOrEmpty(CHROMEWEBDRIVER) ? "" : $"-d {CHROMEWEBDRIVER}")); + (string.IsNullOrEmpty(CHROMEWEBDRIVER) ? "" : $"-d {CHROMEWEBDRIVER}") + + "-v"); } catch { failedTests++; } finally { diff --git a/tests/SkiaSharp.Wasm.Tests.sln b/tests/SkiaSharp.Wasm.Tests.sln index bbb36fef98a..890e9d9b11f 100644 --- a/tests/SkiaSharp.Wasm.Tests.sln +++ b/tests/SkiaSharp.Wasm.Tests.sln @@ -3,7 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30212.25 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Wasm.Tests", "SkiaSharp.Wasm.Tests\SkiaSharp.Wasm.Tests.csproj", "{E7D44825-9F38-4ADA-BCF5-EB9420200DE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Wasm.Tests", "SkiaSharp.Wasm.Tests\SkiaSharp.Wasm.Tests.csproj", "{E7D44825-9F38-4ADA-BCF5-EB9420200DE4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{1E9C7704-0C62-40AE-8D9F-139D530E8D82}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\binding\SkiaSharp\SkiaSharp.csproj", "{B020BCC5-FC01-4ADC-839E-18E63BC6D4C5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{6E6DF00F-30EF-479B-92FB-B07DDE6B1259}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,5 +21,23 @@ Global {E7D44825-9F38-4ADA-BCF5-EB9420200DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7D44825-9F38-4ADA-BCF5-EB9420200DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7D44825-9F38-4ADA-BCF5-EB9420200DE4}.Release|Any CPU.Build.0 = Release|Any CPU + {1E9C7704-0C62-40AE-8D9F-139D530E8D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E9C7704-0C62-40AE-8D9F-139D530E8D82}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E9C7704-0C62-40AE-8D9F-139D530E8D82}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E9C7704-0C62-40AE-8D9F-139D530E8D82}.Release|Any CPU.Build.0 = Release|Any CPU + {B020BCC5-FC01-4ADC-839E-18E63BC6D4C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B020BCC5-FC01-4ADC-839E-18E63BC6D4C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B020BCC5-FC01-4ADC-839E-18E63BC6D4C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B020BCC5-FC01-4ADC-839E-18E63BC6D4C5}.Release|Any CPU.Build.0 = Release|Any CPU + {6E6DF00F-30EF-479B-92FB-B07DDE6B1259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E6DF00F-30EF-479B-92FB-B07DDE6B1259}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E6DF00F-30EF-479B-92FB-B07DDE6B1259}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E6DF00F-30EF-479B-92FB-B07DDE6B1259}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A5F69CA9-2A95-410C-A070-2B0E1759B013} EndGlobalSection EndGlobal diff --git a/utils/WasmTestRunner/WasmTestRunner.csproj b/utils/WasmTestRunner/WasmTestRunner.csproj index fbe1421883f..7f73c189b13 100644 --- a/utils/WasmTestRunner/WasmTestRunner.csproj +++ b/utils/WasmTestRunner/WasmTestRunner.csproj @@ -10,7 +10,7 @@ - + \ No newline at end of file From 104d6dbd2e83a4455b989567851348f086f45d97 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 21 May 2021 03:54:50 +0200 Subject: [PATCH 16/19] Logging --- build.cake | 8 ++++---- scripts/azure-pipelines.yml | 2 +- scripts/azure-templates-bootstrapper.yml | 2 +- utils/WasmTestRunner/Program.cs | 8 +++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.cake b/build.cake index 7a1e7d522e1..7410c42491f 100644 --- a/build.cake +++ b/build.cake @@ -328,10 +328,10 @@ Task ("tests-wasm") WorkingDirectory = pubDir, }); DotNetCoreRun("./utils/WasmTestRunner/WasmTestRunner.csproj", - "http://localhost:8000/ " + - "-o ./tests/SkiaSharp.Wasm.Tests/TestResults/ " + - (string.IsNullOrEmpty(CHROMEWEBDRIVER) ? "" : $"-d {CHROMEWEBDRIVER}") + - "-v"); + "--output=\"./tests/SkiaSharp.Wasm.Tests/TestResults/\" " + + (string.IsNullOrEmpty(CHROMEWEBDRIVER) ? "" : $"--driver=\"{CHROMEWEBDRIVER}\" ") + + "--verbose " + + "\"http://127.0.0.1:8000/\" "); } catch { failedTests++; } finally { diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index ee3b6f2d058..671bf243a34 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -681,7 +681,7 @@ stages: vmImage: $(VM_IMAGE_LINUX) packages: $(MANAGED_LINUX_PACKAGES) ninja-build target: tests-wasm - additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER) + additionalArgs: --verbosity=diagnostic --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER) shouldPublish: false requiredArtifacts: - native_wasm_linux diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 98f64eeaa4f..66ecac5c639 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -15,7 +15,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '4770100' # the build number to download externals from + buildExternals: '4783684' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build diff --git a/utils/WasmTestRunner/Program.cs b/utils/WasmTestRunner/Program.cs index c9f8e1c4f1f..7600077e9cd 100644 --- a/utils/WasmTestRunner/Program.cs +++ b/utils/WasmTestRunner/Program.cs @@ -46,7 +46,7 @@ public static int Main(string[] args) extra = p.Parse(args); if (extra.Count > 1) - throw new OptionException(); + throw new OptionException("To many extras provided.", "extras"); Url = extra.FirstOrDefault() ?? DefaultUrl; if (string.IsNullOrEmpty(OutputPath)) @@ -56,11 +56,13 @@ public static int Main(string[] args) if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir); } - catch (OptionException e) + catch (OptionException ex) { Console.Error.Write("wasm-test: "); - Console.Error.WriteLine(e.Message); + Console.Error.WriteLine(ex.Message); Console.Error.WriteLine("Try `wasm-test --help' for more information."); + if (Verbose) + Console.Error.WriteLine(ex); return 1; } From 68312a25ef4254326161b9410ec527089d64f4ff Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 21 May 2021 04:44:53 +0200 Subject: [PATCH 17/19] soclose --- scripts/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 671bf243a34..820d259d84f 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -681,12 +681,13 @@ stages: vmImage: $(VM_IMAGE_LINUX) packages: $(MANAGED_LINUX_PACKAGES) ninja-build target: tests-wasm - additionalArgs: --verbosity=diagnostic --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER) + additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER) shouldPublish: false requiredArtifacts: - native_wasm_linux installEmsdk: true initScript: source ~/emsdk/emsdk_env.sh + verbosity: diagnostic postBuildSteps: - task: PublishTestResults@2 displayName: Publish the WASM test results From 745a3034d76b0d91a0f90a3c32ca5a6ff6cc71cb Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 21 May 2021 05:01:43 +0200 Subject: [PATCH 18/19] back --- scripts/azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index 820d259d84f..ee3b6f2d058 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -687,7 +687,6 @@ stages: - native_wasm_linux installEmsdk: true initScript: source ~/emsdk/emsdk_env.sh - verbosity: diagnostic postBuildSteps: - task: PublishTestResults@2 displayName: Publish the WASM test results From 0ebac613f25571a50d6cc917ad0d7d26973a1b7e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 21 May 2021 16:56:54 +0200 Subject: [PATCH 19/19] Build all --- scripts/azure-templates-bootstrapper.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 66ecac5c639..62135074fa1 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -15,7 +15,7 @@ parameters: condition: succeeded() # whether or not to run this template shouldPublish: true # whether or not to publish the artifacts configuration: $(CONFIGURATION) # the build configuration - buildExternals: '4783684' # the build number to download externals from + buildExternals: '' # the build number to download externals from verbosity: $(VERBOSITY) # the level of verbosity to use when building docker: '' # the Docker image to build and use dockerArgs: '' # any additional arguments to pass to docker build @@ -26,17 +26,17 @@ parameters: installEmsdk: false # whether or not to install the Emscripten SDK jobs: -- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: - - template: azure-templates-download.yml - parameters: - name: ${{ parameters.name }} - displayName: ${{ parameters.displayName }} - vmImage: ${{ parameters.vmImage }} - condition: ${{ parameters.condition }} - postBuildSteps: ${{ parameters.postBuildSteps }} - buildExternals: ${{ parameters.buildExternals }} +# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}: +# - template: azure-templates-download.yml +# parameters: +# name: ${{ parameters.name }} +# displayName: ${{ parameters.displayName }} +# vmImage: ${{ parameters.vmImage }} +# condition: ${{ parameters.condition }} +# postBuildSteps: ${{ parameters.postBuildSteps }} +# buildExternals: ${{ parameters.buildExternals }} -- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: +# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}: - job: ${{ parameters.name }} displayName: ${{ parameters.displayName }} timeoutInMinutes: 120