diff --git a/build.cake b/build.cake index 1569e842088..7410c42491f 100644 --- a/build.cake +++ b/build.cake @@ -328,9 +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}")); + "--output=\"./tests/SkiaSharp.Wasm.Tests/TestResults/\" " + + (string.IsNullOrEmpty(CHROMEWEBDRIVER) ? "" : $"--driver=\"{CHROMEWEBDRIVER}\" ") + + "--verbose " + + "\"http://127.0.0.1:8000/\" "); } catch { failedTests++; } finally { 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-pipelines.yml b/scripts/azure-pipelines.yml index 20e35251702..ee3b6f2d058 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -25,6 +25,8 @@ variables: XCODE_VERSION: 12.4 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://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 diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index f030fbac9fd..62135074fa1 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -110,7 +110,30 @@ jobs: packageType: 'sdk' version: $(DOTNET_VERSION) performMultiLevelLookup: true - displayName: Install the correct version of .NET Core + 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_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY\dotnet" -Verbose + dotnet --list-sdks + 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_PREVIEW --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + dotnet --list-sdks + 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_PREVIEW --install-dir $AGENT_TOOLSDIRECTORY/dotnet --verbose + dotnet --list-sdks + 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') }}: 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/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; } 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