From 714a4e12a86c4cc0bd69edbb1270676f574f42dd Mon Sep 17 00:00:00 2001 From: "azure-pipelines[bot]" Date: Wed, 3 Oct 2018 18:03:25 +0000 Subject: [PATCH 01/38] Initial setup for pipelines --- azure-pipelines.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000000..e47c6513b0 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,13 @@ + +pool: + vmImage: 'macOS 10.13' + +steps: +- task: Xcode@5 + inputs: + actions: 'build' + scheme: '' + sdk: 'macosx10.12' + configuration: 'Release' + xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' + xcodeVersion: 'default' # Options: 8, 9, default, specifyPath From d12a1ab32fd7455bca7467473e9b92e1a245de4d Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 3 Oct 2018 21:12:14 +0300 Subject: [PATCH 02/38] Update azure-pipelines.yml --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e47c6513b0..6794b9f2fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,11 +3,12 @@ pool: vmImage: 'macOS 10.13' steps: +- bash: 'xcodebuild -showsdks' - task: Xcode@5 inputs: actions: 'build' scheme: '' - sdk: 'macosx10.12' + sdk: 'macosx10.13' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath From f48ade4ed520450d7377e4f27fba72bb480beec2 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 19:59:46 +0100 Subject: [PATCH 03/38] add cake script to build managed side. --- .gitignore | 9 +-- azure-pipelines.yml | 12 ++++ build.cake | 144 ++++++++++++++++++++++++++++++++++++++++++++ parameters.cake | 69 +++++++++++++++++++++ 4 files changed, 230 insertions(+), 4 deletions(-) create mode 100644 build.cake create mode 100644 parameters.cake diff --git a/.gitignore b/.gitignore index 2695f2a71e..9caef6f3fd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ [Bb]in/ packages/ TestResults/ +artifacts/ # globs Makefile.in @@ -39,7 +40,7 @@ Thumbs.db # dotCover *.dotCover - -src/Avalonia\.Native\.OSX/Avalonia\.Native\.OSX\.xcodeproj/project\.xcworkspace/xcshareddata/IDEWorkspaceChecks\.plist - -src/Avalonia\.Native\.OSX/Avalonia\.Native\.OSX\.xcodeproj/project\.xcworkspace/xcshareddata/WorkspaceSettings\.xcsettings + +src/Avalonia\.Native\.OSX/Avalonia\.Native\.OSX\.xcodeproj/project\.xcworkspace/xcshareddata/IDEWorkspaceChecks\.plist + +src/Avalonia\.Native\.OSX/Avalonia\.Native\.OSX\.xcodeproj/project\.xcworkspace/xcshareddata/WorkspaceSettings\.xcsettings diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6794b9f2fe..b0182e0c9a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,3 +12,15 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath +- task: DotNetCoreInstaller@0 + inputs: + version: '2.1.401' +- script: | + export COREHOST_TRACE=0 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + which dotnet + dotnet --info + dotnet tool install -g Cake.Tool --version 0.30.0 + export PATH="$PATH:$HOME/.dotnet/tools" + dotnet cake build.cake -Target="Azure-Linux" -Platform="Any CPU" -Configuration="Release" diff --git a/build.cake b/build.cake new file mode 100644 index 0000000000..8b4ee5cfd8 --- /dev/null +++ b/build.cake @@ -0,0 +1,144 @@ +#load "./parameters.cake" + +Setup(context => +{ + Information("Running tasks..."); + return new Parameters(context); +}); + +Teardown((context, parameters) => +{ + Information("Finished running tasks."); +}); + +Task("Clean") + .Does(parameters => +{ + foreach(var project in parameters.BuildProjects) + { + (string path, string name) = project; + Information($"Clean: {name}"); + DotNetCoreClean($"{path}/{name}/{name}.csproj", new DotNetCoreCleanSettings { + Configuration = parameters.Configuration, + Verbosity = DotNetCoreVerbosity.Minimal + }); + } +}); + +Task("Build") + .Does(parameters => +{ + foreach(var project in parameters.BuildProjects) + { + (string path, string name) = project; + Information($"Build: {name}"); + DotNetCoreBuild($"{path}/{name}/{name}.csproj", new DotNetCoreBuildSettings { + Configuration = parameters.Configuration, + VersionSuffix = parameters.VersionSuffix + }); + } +}); + +Task("Test") + .Does(parameters => +{ + foreach(var project in parameters.TestProjects) + { + (string path, string name) = project; + Information($"Test: {name}"); + DotNetCoreTest($"{path}/{name}/{name}.csproj", new DotNetCoreTestSettings { + Configuration = parameters.Configuration + }); + } +}); + +Task("Publish") + .Does(parameters => +{ + CleanDirectory($"{parameters.Artifacts}/zip"); + var redistVersion = "14.15.26706"; + var redistPath = $"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Redist\\MSVC\\{redistVersion}\\x64\\Microsoft.VC141.CRT\\"; + var redistRuntime = "win7-x64"; + foreach(var project in parameters.PublishProjects) + { + (string path, string name, string framework, string runtime) = project; + var output = $"./{parameters.Artifacts}/publish/{name}-{framework}-{runtime}"; + Information($"Publish: {name}, {framework}, {runtime}"); + DotNetCorePublish($"{path}/{name}/{name}.csproj", new DotNetCorePublishSettings { + Configuration = parameters.Configuration, + VersionSuffix = parameters.VersionSuffix, + Framework = framework, + Runtime = runtime, + OutputDirectory = output + }); + if (string.Compare(runtime, redistRuntime, StringComparison.OrdinalIgnoreCase) == 0) + { + CopyFileToDirectory($"{redistPath}msvcp140.dll", output); + CopyFileToDirectory($"{redistPath}vcruntime140.dll", output); + } + Zip($"{parameters.Artifacts}/publish/{name}-{framework}-{runtime}", $"{parameters.Artifacts}/zip/{name}-{framework}-{runtime}.zip"); + } +}); + +Task("Pack") + .Does(parameters => +{ + CleanDirectory($"{parameters.Artifacts}/nuget"); + foreach(var project in parameters.PackProjects) + { + (string path, string name) = project; + Information($"Pack: {name}"); + DotNetCorePack($"{path}/{name}/{name}.csproj", new DotNetCorePackSettings { + Configuration = parameters.Configuration, + VersionSuffix = parameters.VersionSuffix, + OutputDirectory = $"{parameters.Artifacts}/nuget" + }); + } +}); + +Task("Push") + .WithCriteria((context, parameters) => parameters.PushNuGet) + .Does(parameters => +{ + var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY"); + var apiUrl = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_URL" : "MYGET_API_URL"); + var packages = GetFiles($"{parameters.Artifacts}/nuget/*.nupkg"); + foreach (var package in packages) + { + DotNetCoreNuGetPush(package.FullPath, new DotNetCoreNuGetPushSettings { + Source = apiUrl, + ApiKey = apiKey + }); + } +}); + +Task("Default") + .IsDependentOn("Build"); + +Task("AppVeyor") + .IsDependentOn("Clean") + .IsDependentOn("Build") + .IsDependentOn("Test") + .IsDependentOn("Publish") + .IsDependentOn("Pack") + .IsDependentOn("Push"); + +Task("Travis") + .IsDependentOn("Test"); + +Task("CircleCI") + .IsDependentOn("Test"); + +Task("Azure") + .IsDependentOn("Clean") + .IsDependentOn("Build") + .IsDependentOn("Pack") + .IsDependentOn("Push"); + +Task("Azure-macOS") + .IsDependentOn("Test"); + +Task("Azure-Linux") + .IsDependentOn("Test"); + +RunTarget(Context.Argument("target", "Default")); \ No newline at end of file diff --git a/parameters.cake b/parameters.cake new file mode 100644 index 0000000000..1dd1b85375 --- /dev/null +++ b/parameters.cake @@ -0,0 +1,69 @@ + +public class Parameters +{ + public string Configuration { get; private set; } + public string Artifacts { get; private set; } + public string VersionSuffix { get; private set; } + public string NuGetPushBranch { get; private set; } + public string NuGetPushRepoName { get; private set; } + public bool PushNuGet { get; private set; } + public bool IsNugetRelease { get; private set; } + public (string path, string name)[] BuildProjects { get; private set; } + public (string path, string name)[] TestProjects { get; private set; } + public (string path, string name, string framework, string runtime)[] PublishProjects { get; private set; } + public (string path, string name)[] PackProjects { get; private set; } + + public Parameters(ICakeContext context) + { + Configuration = context.Argument("configuration", "Release"); + Artifacts = context.Argument("artifacts", "./artifacts"); + + VersionSuffix = context.Argument("suffix", default(string)); + if (VersionSuffix == null) + { + var build = context.EnvironmentVariable("APPVEYOR_BUILD_VERSION"); + VersionSuffix = build != null ? $"-build{build}" : ""; + } + + NuGetPushBranch = "master"; + NuGetPushRepoName = "AvaloniaUI/Avalonia.Native"; + + var repoName = context.EnvironmentVariable("APPVEYOR_REPO_NAME"); + var repoBranch = context.EnvironmentVariable("APPVEYOR_REPO_BRANCH"); + var repoTag = context.EnvironmentVariable("APPVEYOR_REPO_TAG"); + var repoTagName = context.EnvironmentVariable("APPVEYOR_REPO_TAG_NAME"); + var pullRequestTitle = context.EnvironmentVariable("APPVEYOR_PULL_REQUEST_TITLE"); + + if (pullRequestTitle == null + && string.Compare(repoName, NuGetPushRepoName, StringComparison.OrdinalIgnoreCase) == 0 + && string.Compare(repoBranch, NuGetPushBranch, StringComparison.OrdinalIgnoreCase) == 0) + { + PushNuGet = true; + } + + if (pullRequestTitle == null + && string.Compare(repoTag, "True", StringComparison.OrdinalIgnoreCase) == 0 + && repoTagName != null) + { + IsNugetRelease = true; + } + + BuildProjects = new [] + { + ( "./src", "Avalonia.Native" ) + }; + + TestProjects = new (string path, string name) [] + { + }; + + PublishProjects = new (string path, string name, string framework, string runtime) [] + { + }; + + PackProjects = new [] + { + ( "./src", "Avalonia.Native" ) + }; + } +} \ No newline at end of file From 0b70105d58dc1478a7bef8c2037e7446ab86e18b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 20:02:14 +0100 Subject: [PATCH 04/38] fix build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b0182e0c9a..246aad3bd5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -23,4 +23,4 @@ steps: dotnet --info dotnet tool install -g Cake.Tool --version 0.30.0 export PATH="$PATH:$HOME/.dotnet/tools" - dotnet cake build.cake -Target="Azure-Linux" -Platform="Any CPU" -Configuration="Release" + dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" From 8e0bee384d88484fbccbb48ccc670a9c7057ad38 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 20:04:42 +0100 Subject: [PATCH 05/38] build installs castxml --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 246aad3bd5..d49991f792 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,6 +16,7 @@ steps: inputs: version: '2.1.401' - script: | + brew install castxml export COREHOST_TRACE=0 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 From 2a2de46384cee162ba6e0aeb268858bc1fbc49c3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 20:41:39 +0100 Subject: [PATCH 06/38] fix build number --- parameters.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parameters.cake b/parameters.cake index 1dd1b85375..1ebc599ce5 100644 --- a/parameters.cake +++ b/parameters.cake @@ -21,7 +21,7 @@ public class Parameters VersionSuffix = context.Argument("suffix", default(string)); if (VersionSuffix == null) { - var build = context.EnvironmentVariable("APPVEYOR_BUILD_VERSION"); + var build = context.EnvironmentVariable("AZURE_BUILD_VERSION"); VersionSuffix = build != null ? $"-build{build}" : ""; } From 05fec71a727fbf3df6b099eedc21ba11c0533e16 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 20:46:20 +0100 Subject: [PATCH 07/38] fix build number and force publish package. --- build.cake | 2 +- parameters.cake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index 8b4ee5cfd8..8f055180de 100644 --- a/build.cake +++ b/build.cake @@ -97,7 +97,7 @@ Task("Pack") }); Task("Push") - .WithCriteria((context, parameters) => parameters.PushNuGet) + //.WithCriteria((context, parameters) => parameters.PushNuGet) .Does(parameters => { var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY"); diff --git a/parameters.cake b/parameters.cake index 1ebc599ce5..ea679abc31 100644 --- a/parameters.cake +++ b/parameters.cake @@ -21,7 +21,7 @@ public class Parameters VersionSuffix = context.Argument("suffix", default(string)); if (VersionSuffix == null) { - var build = context.EnvironmentVariable("AZURE_BUILD_VERSION"); + var build = context.EnvironmentVariable("Build.BuildNumber"); VersionSuffix = build != null ? $"-build{build}" : ""; } From 24a4cdd576fcfb1dd8659b3558bea772a44a9188 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 21:05:25 +0100 Subject: [PATCH 08/38] fix package naming --- build.cake | 8 ++++++-- parameters.cake | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.cake b/build.cake index 8f055180de..d6ab7e5f3f 100644 --- a/build.cake +++ b/build.cake @@ -91,13 +91,17 @@ Task("Pack") DotNetCorePack($"{path}/{name}/{name}.csproj", new DotNetCorePackSettings { Configuration = parameters.Configuration, VersionSuffix = parameters.VersionSuffix, - OutputDirectory = $"{parameters.Artifacts}/nuget" + OutputDirectory = $"{parameters.Artifacts}/nuget", + EnvironmentVariables = new Dictionary + { + { "VERSION", parameters.Version } + } }); } }); Task("Push") - //.WithCriteria((context, parameters) => parameters.PushNuGet) + .WithCriteria((context, parameters) => parameters.PushNuGet) .Does(parameters => { var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY"); diff --git a/parameters.cake b/parameters.cake index ea679abc31..f182559175 100644 --- a/parameters.cake +++ b/parameters.cake @@ -4,6 +4,7 @@ public class Parameters public string Configuration { get; private set; } public string Artifacts { get; private set; } public string VersionSuffix { get; private set; } + public string Version { get; private set; } = "0.7.0"; public string NuGetPushBranch { get; private set; } public string NuGetPushRepoName { get; private set; } public bool PushNuGet { get; private set; } @@ -21,7 +22,7 @@ public class Parameters VersionSuffix = context.Argument("suffix", default(string)); if (VersionSuffix == null) { - var build = context.EnvironmentVariable("Build.BuildNumber"); + var build = context.EnvironmentVariable("BUILD_BUILDNUMBER"); VersionSuffix = build != null ? $"-build{build}" : ""; } From 6eef74bfa83ac92b49f8af5c3495260e389765a6 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 21:14:10 +0100 Subject: [PATCH 09/38] build number in nuget package. --- build.cake | 2 +- parameters.cake | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.cake b/build.cake index d6ab7e5f3f..0b356ec9bd 100644 --- a/build.cake +++ b/build.cake @@ -90,7 +90,7 @@ Task("Pack") Information($"Pack: {name}"); DotNetCorePack($"{path}/{name}/{name}.csproj", new DotNetCorePackSettings { Configuration = parameters.Configuration, - VersionSuffix = parameters.VersionSuffix, + VersionSuffix = "parameters.VersionSuffix", OutputDirectory = $"{parameters.Artifacts}/nuget", EnvironmentVariables = new Dictionary { diff --git a/parameters.cake b/parameters.cake index f182559175..780ab36d4b 100644 --- a/parameters.cake +++ b/parameters.cake @@ -26,6 +26,8 @@ public class Parameters VersionSuffix = build != null ? $"-build{build}" : ""; } + Version += "-build" + context.EnvironmentVariable("BUILD_BUILDNUMBER"); + NuGetPushBranch = "master"; NuGetPushRepoName = "AvaloniaUI/Avalonia.Native"; From 10559441dc7c66a084664296f3b924276f5bbe37 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 3 Oct 2018 21:22:02 +0100 Subject: [PATCH 10/38] fix package name. and force push to test --- build.cake | 2 +- parameters.cake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index 0b356ec9bd..49c7b04039 100644 --- a/build.cake +++ b/build.cake @@ -101,7 +101,7 @@ Task("Pack") }); Task("Push") - .WithCriteria((context, parameters) => parameters.PushNuGet) + //.WithCriteria((context, parameters) => parameters.PushNuGet) .Does(parameters => { var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY"); diff --git a/parameters.cake b/parameters.cake index 780ab36d4b..5cecf21fac 100644 --- a/parameters.cake +++ b/parameters.cake @@ -26,7 +26,7 @@ public class Parameters VersionSuffix = build != null ? $"-build{build}" : ""; } - Version += "-build" + context.EnvironmentVariable("BUILD_BUILDNUMBER"); + Version += "-build" + context.EnvironmentVariable("BUILD_BUILDNUMBER").Replace(".",""); NuGetPushBranch = "master"; NuGetPushRepoName = "AvaloniaUI/Avalonia.Native"; From 1ad0d7ceb3e6862e571ea85ebcf49def25f9f682 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 4 Oct 2018 00:46:53 +0300 Subject: [PATCH 11/38] Fixed Dispatcher.CheckAccess from always returning true --- src/Avalonia.Native/AvaloniaNativePlatform.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Native/AvaloniaNativePlatform.cs b/src/Avalonia.Native/AvaloniaNativePlatform.cs index d8cace98d2..ceb8c51f9d 100644 --- a/src/Avalonia.Native/AvaloniaNativePlatform.cs +++ b/src/Avalonia.Native/AvaloniaNativePlatform.cs @@ -63,6 +63,7 @@ namespace Avalonia.Native _factory.Initialize(); AvaloniaLocator.CurrentMutable + .Bind().ToConstant(new PlatformThreadingInterface(_factory.CreatePlatformThreadingInterface())) .Bind().ToTransient() .Bind().ToSingleton() @@ -73,8 +74,8 @@ namespace Avalonia.Native .Bind().ToConstant(new ClipboardImpl(_factory.CreateClipboard())) .Bind().ToConstant(new RenderLoop()) .Bind().ToConstant(new DefaultRenderTimer(60)) - .Bind().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs())) - .Bind().ToConstant(new PlatformThreadingInterface(_factory.CreatePlatformThreadingInterface())); + .Bind().ToConstant(new SystemDialogs(_factory.CreateSystemDialogs())); + } public IWindowImpl CreateWindow() From 8aae66f12c97bfecee50f341e3b161e2abe2d45e Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Thu, 4 Oct 2018 00:47:06 +0300 Subject: [PATCH 12/38] OSX 10.12 compatibility --- src/Avalonia.Native.OSX/window.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Native.OSX/window.mm b/src/Avalonia.Native.OSX/window.mm index 0e745fdf8a..315bb94ee1 100644 --- a/src/Avalonia.Native.OSX/window.mm +++ b/src/Avalonia.Native.OSX/window.mm @@ -572,7 +572,7 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent } -- (NSArray *)validAttributesForMarkedText +- (NSArray *)validAttributesForMarkedText { return [NSArray new]; } From 931331c33a7bddf3509db6aed91e5d3961a0b08b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 10:37:28 +0100 Subject: [PATCH 13/38] fix logic for pushing nuget package --- build.cake | 2 +- parameters.cake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.cake b/build.cake index 49c7b04039..0b356ec9bd 100644 --- a/build.cake +++ b/build.cake @@ -101,7 +101,7 @@ Task("Pack") }); Task("Push") - //.WithCriteria((context, parameters) => parameters.PushNuGet) + .WithCriteria((context, parameters) => parameters.PushNuGet) .Does(parameters => { var apiKey = EnvironmentVariable(parameters.IsNugetRelease ? "NUGET_API_KEY" : "MYGET_API_KEY"); diff --git a/parameters.cake b/parameters.cake index 5cecf21fac..4c5332741d 100644 --- a/parameters.cake +++ b/parameters.cake @@ -29,13 +29,13 @@ public class Parameters Version += "-build" + context.EnvironmentVariable("BUILD_BUILDNUMBER").Replace(".",""); NuGetPushBranch = "master"; - NuGetPushRepoName = "AvaloniaUI/Avalonia.Native"; + NuGetPushRepoName = "https://github.com/AvaloniaUI/Avalonia.Native"; - var repoName = context.EnvironmentVariable("APPVEYOR_REPO_NAME"); - var repoBranch = context.EnvironmentVariable("APPVEYOR_REPO_BRANCH"); + var repoName = context.EnvironmentVariable("BUILD_REPOSITORY_URI"); + var repoBranch = context.EnvironmentVariable("BUILD_SOURCEBRANCHNAME"); var repoTag = context.EnvironmentVariable("APPVEYOR_REPO_TAG"); var repoTagName = context.EnvironmentVariable("APPVEYOR_REPO_TAG_NAME"); - var pullRequestTitle = context.EnvironmentVariable("APPVEYOR_PULL_REQUEST_TITLE"); + var pullRequestTitle = context.EnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH"); if (pullRequestTitle == null && string.Compare(repoName, NuGetPushRepoName, StringComparison.OrdinalIgnoreCase) == 0 From 5980c068dc8f041625ec0b645feb6a380ccb7510 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 10:39:26 +0100 Subject: [PATCH 14/38] post information --- parameters.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parameters.cake b/parameters.cake index 4c5332741d..cb16cd5360 100644 --- a/parameters.cake +++ b/parameters.cake @@ -37,6 +37,8 @@ public class Parameters var repoTagName = context.EnvironmentVariable("APPVEYOR_REPO_TAG_NAME"); var pullRequestTitle = context.EnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH"); + Information($"RepoName: {repoName}, RepoBranch: {repoBranch}, PR Title: {pullRequestTitle}"); + if (pullRequestTitle == null && string.Compare(repoName, NuGetPushRepoName, StringComparison.OrdinalIgnoreCase) == 0 && string.Compare(repoBranch, NuGetPushBranch, StringComparison.OrdinalIgnoreCase) == 0) From e9310c8d6a715b1788a44fd0b4e427780e85a0af Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 10:46:34 +0100 Subject: [PATCH 15/38] print info --- parameters.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parameters.cake b/parameters.cake index cb16cd5360..191620aa70 100644 --- a/parameters.cake +++ b/parameters.cake @@ -37,7 +37,7 @@ public class Parameters var repoTagName = context.EnvironmentVariable("APPVEYOR_REPO_TAG_NAME"); var pullRequestTitle = context.EnvironmentVariable("SYSTEM_PULLREQUEST_SOURCEBRANCH"); - Information($"RepoName: {repoName}, RepoBranch: {repoBranch}, PR Title: {pullRequestTitle}"); + System.Console.WriteLine($"RepoName: {repoName}, RepoBranch: {repoBranch}, PR Title: {pullRequestTitle}/."); if (pullRequestTitle == null && string.Compare(repoName, NuGetPushRepoName, StringComparison.OrdinalIgnoreCase) == 0 From c37b5b0d74db20f52be89cdb60cff00869f3f22b Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 13:01:58 +0100 Subject: [PATCH 16/38] rename stubs.cs --- src/Avalonia.Native/{Stubs.cs => ClipboardImpl.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/Avalonia.Native/{Stubs.cs => ClipboardImpl.cs} (100%) diff --git a/src/Avalonia.Native/Stubs.cs b/src/Avalonia.Native/ClipboardImpl.cs similarity index 100% rename from src/Avalonia.Native/Stubs.cs rename to src/Avalonia.Native/ClipboardImpl.cs From 9cc70315e7c0564402f0bafdfce9248ba4b2e485 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 15:05:37 +0100 Subject: [PATCH 17/38] include binary in the package --- src/Avalonia.Native/Avalonia.Native.csproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index 7b0eef0a92..2926f0e78c 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -20,4 +20,12 @@ + + + + runtimes/osx-x64/libAvalonia.Native.OSX.dylib + true + PreserveNewest + + From 0a0bb1556de4cc9ed71fd7a8ad97bf7091c15ab3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 15:12:21 +0100 Subject: [PATCH 18/38] use release dylib --- src/Avalonia.Native/Avalonia.Native.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index 2926f0e78c..f105625bf3 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -22,7 +22,7 @@ - + runtimes/osx-x64/libAvalonia.Native.OSX.dylib true PreserveNewest From 951fc851c0fb7e38b6955bffddc2ebb3211b040c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 15:25:35 +0100 Subject: [PATCH 19/38] test packing the binary --- azure-pipelines.yml | 2 ++ src/Avalonia.Native/Avalonia.Native.csproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d49991f792..10da3c9fe4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,10 +12,12 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath + outputPath: 'src/Avalonia.Native/bin/Release/netstandard2.0/' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' - script: | + ls src/Avalonia.Native/bin/Release/netstandard2.0/ brew install castxml export COREHOST_TRACE=0 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index f105625bf3..6db4640cd2 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -22,7 +22,7 @@ - + runtimes/osx-x64/libAvalonia.Native.OSX.dylib true PreserveNewest From 0a9ff55ffc7895eca7ab630d0ebaad9312b7dbe3 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:01:26 +0100 Subject: [PATCH 20/38] fix xcode build path --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 10da3c9fe4..de417a2969 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,12 +12,12 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - outputPath: 'src/Avalonia.Native/bin/Release/netstandard2.0/' + exportPath: 'src/Avalonia.Native/bin/Release/netstandard2.0' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native/bin/Release/netstandard2.0/ + ls src/Avalonia.Native/bin/Release/netstandard2.0 brew install castxml export COREHOST_TRACE=0 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From a8af39ebdb264819f4af485fecb3a5b5a6c0ed81 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:06:23 +0100 Subject: [PATCH 21/38] debug pipeline --- azure-pipelines.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index de417a2969..c92ccb310b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,13 +17,13 @@ steps: inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native/bin/Release/netstandard2.0 - brew install castxml - export COREHOST_TRACE=0 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - which dotnet - dotnet --info - dotnet tool install -g Cake.Tool --version 0.30.0 - export PATH="$PATH:$HOME/.dotnet/tools" - dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" + ls src/Avalonia.Native.OSX/ + #brew install castxml + #export COREHOST_TRACE=0 + #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + #export DOTNET_CLI_TELEMETRY_OPTOUT=1 + #which dotnet + #dotnet --info + #dotnet tool install -g Cake.Tool --version 0.30.0 + #export PATH="$PATH:$HOME/.dotnet/tools" + #dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" From 94f2212f97f47e9bcaf7064937a743cf929a29e1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:09:08 +0100 Subject: [PATCH 22/38] set archive path --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c92ccb310b..04bbe66294 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - exportPath: 'src/Avalonia.Native/bin/Release/netstandard2.0' + archivePath: 'src/Avalonia.Native/bin/Release/netstandard2.0' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' From e7cc41235bf9070e1f7181160c83129628339a1c Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:10:51 +0100 Subject: [PATCH 23/38] debug pipeline --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 04bbe66294..8cd7ed705a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native.OSX/ + ls src/Avalonia.Native/bin/Release/netstandard2.0 #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From ad9cbb223bbced20e58cdb09f93b9638f2fd93fd Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:16:51 +0100 Subject: [PATCH 24/38] debug --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8cd7ed705a..c6df1f1ecd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,12 +12,12 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - archivePath: 'src/Avalonia.Native/bin/Release/netstandard2.0' + exportPath: 'output/$(SDK)/$(Configuration)' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native/bin/Release/netstandard2.0 + ls src/Avalonia.Native.OSX #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 35bda1539ce9f54544d8b15285a9ff5b874ad97d Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:19:46 +0100 Subject: [PATCH 25/38] debug --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c6df1f1ecd..4bd89aad6d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - exportPath: 'output/$(SDK)/$(Configuration)' + exportPath: '../output/$(SDK)/$(Configuration)' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' From 3c3b1a4565f9febe900628a6da5e2223d9b58182 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:21:32 +0100 Subject: [PATCH 26/38] debug --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4bd89aad6d..88ff95df8b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native.OSX + ls src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 7634b3e13e89e183bfbbf914e8153a1efdd033f4 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:23:54 +0100 Subject: [PATCH 27/38] archiving --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 88ff95df8b..5643d5597f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,13 +6,13 @@ steps: - bash: 'xcodebuild -showsdks' - task: Xcode@5 inputs: - actions: 'build' + actions: 'archive' scheme: '' sdk: 'macosx10.13' configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - exportPath: '../output/$(SDK)/$(Configuration)' + archivePath: '../output/$(SDK)/$(Configuration)' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' From a26604b76fd5dc9987349db697e391324b33bdf1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:26:16 +0100 Subject: [PATCH 28/38] test --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5643d5597f..c89858c8d6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj + ls src/Avalonia.Native.OSX #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 25e55007662bd0d6dbe1462014653799c48fe228 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:39:12 +0100 Subject: [PATCH 29/38] debug --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c89858c8d6..6589b9991e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,12 +12,13 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - archivePath: '../output/$(SDK)/$(Configuration)' + args: '-derivedPath ./build' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' - script: | ls src/Avalonia.Native.OSX + ls src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 0484f3c56c08a56534fbcecb3a9014e6e84fa869 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:41:03 +0100 Subject: [PATCH 30/38] derivedDataPath --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6589b9991e..3576084e3c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ steps: configuration: 'Release' xcWorkspacePath: '**/*.xcodeproj/project.xcworkspace' xcodeVersion: 'default' # Options: 8, 9, default, specifyPath - args: '-derivedPath ./build' + args: '-derivedDataPath ./build' - task: DotNetCoreInstaller@0 inputs: version: '2.1.401' From 5ffe279bd184eae8221d53ac4e1060da19578f89 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:43:31 +0100 Subject: [PATCH 31/38] debug --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3576084e3c..a58104faee 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,6 +19,9 @@ steps: - script: | ls src/Avalonia.Native.OSX ls src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj + ls ./ + ls src/ + ls #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 47fff4f626a7eaca196320b16a932b025bdc4fa2 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:46:12 +0100 Subject: [PATCH 32/38] debug --- azure-pipelines.yml | 23 +++++++++------------- src/Avalonia.Native/Avalonia.Native.csproj | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a58104faee..cf31ff2a8d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,17 +17,12 @@ steps: inputs: version: '2.1.401' - script: | - ls src/Avalonia.Native.OSX - ls src/Avalonia.Native.OSX/Avalonia.Native.OSX.xcodeproj - ls ./ - ls src/ - ls - #brew install castxml - #export COREHOST_TRACE=0 - #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - #export DOTNET_CLI_TELEMETRY_OPTOUT=1 - #which dotnet - #dotnet --info - #dotnet tool install -g Cake.Tool --version 0.30.0 - #export PATH="$PATH:$HOME/.dotnet/tools" - #dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" + brew install castxml + export COREHOST_TRACE=0 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + which dotnet + dotnet --info + dotnet tool install -g Cake.Tool --version 0.30.0 + export PATH="$PATH:$HOME/.dotnet/tools" + dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index 6db4640cd2..c8a59f1100 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -22,7 +22,7 @@ - + runtimes/osx-x64/libAvalonia.Native.OSX.dylib true PreserveNewest From dbc26a0a620d032b77cb749f757b3c02f675932f Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:50:34 +0100 Subject: [PATCH 33/38] debug --- azure-pipelines.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cf31ff2a8d..d3f700245f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,12 +17,13 @@ steps: inputs: version: '2.1.401' - script: | - brew install castxml - export COREHOST_TRACE=0 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - which dotnet - dotnet --info - dotnet tool install -g Cake.Tool --version 0.30.0 - export PATH="$PATH:$HOME/.dotnet/tools" - dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" + ls ./build + #brew install castxml + #export COREHOST_TRACE=0 + #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + #export DOTNET_CLI_TELEMETRY_OPTOUT=1 + #which dotnet + #dotnet --info + #dotnet tool install -g Cake.Tool --version 0.30.0 + #export PATH="$PATH:$HOME/.dotnet/tools" + #dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" From bcfa46a6c8f128f6b91e00f26eb5a67906babf93 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:52:03 +0100 Subject: [PATCH 34/38] ls build --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3f700245f..d745c46fd7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - ls ./build + ls ./build/Build #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 22afdad0bea382c7418ac81297429f10730365dd Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:55:17 +0100 Subject: [PATCH 35/38] list dir contents --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d745c46fd7..71cc0a5f9a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - ls ./build/Build + find /build #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From 02621d32473bfe08811edc1cde66cefe3e2e2a72 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:56:43 +0100 Subject: [PATCH 36/38] debug --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71cc0a5f9a..babf63eeca 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ steps: inputs: version: '2.1.401' - script: | - find /build + find ./build #brew install castxml #export COREHOST_TRACE=0 #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 From c0ea00a4d4c95b5d73e93cab75a07a1188438900 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 16:59:10 +0100 Subject: [PATCH 37/38] final ? --- azure-pipelines.yml | 19 +++++++++---------- src/Avalonia.Native/Avalonia.Native.csproj | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index babf63eeca..cf31ff2a8d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,13 +17,12 @@ steps: inputs: version: '2.1.401' - script: | - find ./build - #brew install castxml - #export COREHOST_TRACE=0 - #export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - #export DOTNET_CLI_TELEMETRY_OPTOUT=1 - #which dotnet - #dotnet --info - #dotnet tool install -g Cake.Tool --version 0.30.0 - #export PATH="$PATH:$HOME/.dotnet/tools" - #dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" + brew install castxml + export COREHOST_TRACE=0 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + which dotnet + dotnet --info + dotnet tool install -g Cake.Tool --version 0.30.0 + export PATH="$PATH:$HOME/.dotnet/tools" + dotnet cake build.cake -Target="Azure" -Platform="Any CPU" -Configuration="Release" diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index c8a59f1100..74917ea191 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -22,7 +22,7 @@ - + runtimes/osx-x64/libAvalonia.Native.OSX.dylib true PreserveNewest From 1ffd135efa7804edc713f4b2aaa90a69e88aa3c6 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 4 Oct 2018 17:05:14 +0100 Subject: [PATCH 38/38] almost there --- src/Avalonia.Native/Avalonia.Native.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Native/Avalonia.Native.csproj b/src/Avalonia.Native/Avalonia.Native.csproj index 74917ea191..b3051bf550 100644 --- a/src/Avalonia.Native/Avalonia.Native.csproj +++ b/src/Avalonia.Native/Avalonia.Native.csproj @@ -22,7 +22,7 @@ - + runtimes/osx-x64/libAvalonia.Native.OSX.dylib true PreserveNewest