diff --git a/VERSIONS.txt b/VERSIONS.txt index 2b5f6dbd07..90cacac48b 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -28,26 +28,26 @@ HarfBuzz soname 0.20601.0 # SkiaSharp.dll SkiaSharp assembly 1.68.0.0 -SkiaSharp file 1.68.2.0 +SkiaSharp file 1.68.2.1 # HarfBuzzSharp.dll HarfBuzzSharp assembly 1.0.0.0 -HarfBuzzSharp file 2.6.1.2 +HarfBuzzSharp file 2.6.1.3 # nuget versions -SkiaSharp nuget 1.68.2 -SkiaSharp.NativeAssets.Linux nuget 1.68.2 -SkiaSharp.NativeAssets.Linux.NoDependencies nuget 1.68.2 -SkiaSharp.NativeAssets.NanoServer nuget 1.68.2 -SkiaSharp.Views nuget 1.68.2 -SkiaSharp.Views.Desktop.Common nuget 1.68.2 -SkiaSharp.Views.Gtk2 nuget 1.68.2 -SkiaSharp.Views.Gtk3 nuget 1.68.2 -SkiaSharp.Views.WindowsForms nuget 1.68.2 -SkiaSharp.Views.WPF nuget 1.68.2 -SkiaSharp.Views.Forms nuget 1.68.2 -SkiaSharp.Views.Forms.WPF nuget 1.68.2 -SkiaSharp.Views.Forms.GTK nuget 1.68.2 -SkiaSharp.HarfBuzz nuget 1.68.2 -HarfBuzzSharp nuget 2.6.1.2 -HarfBuzzSharp.NativeAssets.Linux nuget 2.6.1.2 +SkiaSharp nuget 1.68.2.1 +SkiaSharp.NativeAssets.Linux nuget 1.68.2.1 +SkiaSharp.NativeAssets.Linux.NoDependencies nuget 1.68.2.1 +SkiaSharp.NativeAssets.NanoServer nuget 1.68.2.1 +SkiaSharp.Views nuget 1.68.2.1 +SkiaSharp.Views.Desktop.Common nuget 1.68.2.1 +SkiaSharp.Views.Gtk2 nuget 1.68.2.1 +SkiaSharp.Views.Gtk3 nuget 1.68.2.1 +SkiaSharp.Views.WindowsForms nuget 1.68.2.1 +SkiaSharp.Views.WPF nuget 1.68.2.1 +SkiaSharp.Views.Forms nuget 1.68.2.1 +SkiaSharp.Views.Forms.WPF nuget 1.68.2.1 +SkiaSharp.Views.Forms.GTK nuget 1.68.2.1 +SkiaSharp.HarfBuzz nuget 1.68.2.1 +HarfBuzzSharp nuget 2.6.1.3 +HarfBuzzSharp.NativeAssets.Linux nuget 2.6.1.3 diff --git a/build.cake b/build.cake index 9d897d959e..600e5f0fe1 100644 --- a/build.cake +++ b/build.cake @@ -119,7 +119,8 @@ Task ("libs") platform = ".Linux"; } } - RunMSBuild ($"./source/SkiaSharpSource{platform}.sln"); + RunMSBuild ($"./source/SkiaSharpSource{platform}.sln", + bl: $"./output/binlogs/libs{platform}.binlog"); // assemble the mdoc docs EnsureDirectoryExists ("./output/docs/mdoc/"); @@ -142,7 +143,9 @@ Task ("tests") void RunDesktopTest (string arch) { - RunMSBuild ("./tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln", platform: arch == "AnyCPU" ? "Any CPU" : arch); + RunMSBuild ("./tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.sln", + platform: arch == "AnyCPU" ? "Any CPU" : arch, + bl: $"./output/binlogs/tests-desktop.{arch}.binlog"); try { RunTests ($"./tests/SkiaSharp.Desktop.Tests/bin/{arch}/{CONFIGURATION}/SkiaSharp.Tests.dll", arch == "x86"); } catch { @@ -164,7 +167,8 @@ Task ("tests") } // .NET Core - RunMSBuild ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.sln"); + RunMSBuild ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.sln", + bl: $"./output/binlogs/tests-netcore.binlog"); try { RunNetCoreTests ("./tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj"); } catch { diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake index e275150404..c42d2332e7 100644 --- a/cake/UpdateDocs.cake +++ b/cake/UpdateDocs.cake @@ -76,6 +76,7 @@ Task ("docs-api-diff") // pretty version var diffDir = "./output/api-diff"; + EnsureDirectoryExists (diffDir); CleanDirectories (diffDir); Information ($"Creating comparer..."); diff --git a/cake/msbuild.cake b/cake/msbuild.cake index 700c912341..156d347e84 100644 --- a/cake/msbuild.cake +++ b/cake/msbuild.cake @@ -6,7 +6,8 @@ void RunMSBuild( string platform = "Any CPU", string platformTarget = null, bool restore = true, - bool restoreOnly = false) + bool restoreOnly = false, + string bl = null) { var nugetSources = new [] { OUTPUT_NUGETS_PATH.FullPath, "https://api.nuget.org/v3/index.json" }; @@ -17,6 +18,13 @@ void RunMSBuild( c.Verbosity = VERBOSITY; c.MaxCpuCount = 0; + if (!string.IsNullOrEmpty(bl)) { + c.BinaryLogger = new MSBuildBinaryLogSettings { + Enabled = true, + FileName = bl, + }; + } + if (!string.IsNullOrEmpty(MSBUILD_EXE)) { c.ToolPath = MSBUILD_EXE; } else if (IsRunningOnWindows() && !string.IsNullOrEmpty(VS_INSTALL)) { diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index fe8e3fbebf..8c5de4af2f 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -10,7 +10,7 @@ pr: - patch/* variables: - SKIASHARP_VERSION: 1.68.2 + SKIASHARP_VERSION: 1.68.2.1 FEATURE_NAME_PREFIX: 'feature/' VERBOSITY: normal GIT_SHA: $(Build.SourceVersion) diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index ce0f1e01e0..5d6258da0e 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -1,12 +1,16 @@ - <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono - <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/local/bin/mono') ">/usr/local/bin/mono - <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And Exists ('/usr/bin/mono') ">/usr/bin/mono - <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' And '$(_ManagedExeLauncher)' == '' ">mono + <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/Library/Frameworks/Mono.framework/Versions/Current/bin/mono') ">/Library/Frameworks/Mono.framework/Versions/Current/bin/mono + <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/usr/local/bin/mono') ">/usr/local/bin/mono + <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and Exists('/usr/bin/mono') ">/usr/bin/mono + <_ManagedExeLauncher Condition=" '$(OS)' != 'Windows_NT' and '$(_ManagedExeLauncher)' == '' ">mono - true + <_SnExePath Condition=" '$(OS)' == 'Windows_NT' and '$(_SnExePath)' == '' and Exists('$(SDK40ToolsPath)sn.exe') ">$(SDK40ToolsPath)sn.exe + <_SnExePath Condition=" '$(OS)' == 'Windows_NT' and '$(_SnExePath)' == '' and Exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe') ">$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\sn.exe + <_SnExePath Condition=" '$(_SnExePath)' == '' ">sn + + true mono.snk $(MSBuildThisFileDirectory)..\$(KeyFileName) @@ -90,8 +94,19 @@ Sign the assembly using sn. =================================================================================================================== --> - - + + + + + + +