Azure pipelines

Cake.Recipe/Content/analyzing.cake

@@ -64,9 +64,9 @@ BuildParameters.Tasks.DupFinderTask = Task("DupFinder")
  BuildParameters.Paths.Directories.DupFinderTestResults.CombineWithFilePath("dupfinder.xml"),
  outputHtmlFile);
 
- if(BuildParameters.IsRunningOnAppVeyor && FileExists(outputHtmlFile))
+ if(!BuildParameters.IsLocalBuild && FileExists(outputHtmlFile))
  {
- AppVeyor.UploadArtifact(outputHtmlFile);
+ BuildParameters.BuildProvider.UploadArtifact(outputHtmlFile);
  }
 
  if(BuildParameters.IsLocalBuild)
@@ -114,9 +114,9 @@ BuildParameters.Tasks.InspectCodeTask = Task("CreateIssuesReport")
  "./",
  issueReportFile);
 
- if(BuildParameters.IsRunningOnAppVeyor && FileExists(issueReportFile))
+ if(!BuildParameters.IsLocalBuild && FileExists(issueReportFile))
  {
- AppVeyor.UploadArtifact(issueReportFile);
+ BuildParameters.BuildProvider.UploadArtifact(issueReportFile);
  }
  });
 

Cake.Recipe/Content/appveyor.cake

@@ -34,21 +34,6 @@ BuildParameters.Tasks.PrintAppVeyorEnvironmentVariablesTask = Task("Print-AppVey
  Information("CONFIGURATION: {0}", EnvironmentVariable("CONFIGURATION"));
 });
 
-BuildParameters.Tasks.UploadAppVeyorArtifactsTask = Task("Upload-AppVeyor-Artifacts")
- .IsDependentOn("Package")
- .WithCriteria(() => BuildParameters.IsRunningOnAppVeyor)
- .WithCriteria(() => DirectoryExists(BuildParameters.Paths.Directories.NuGetPackages) || DirectoryExists(BuildParameters.Paths.Directories.ChocolateyPackages))
- .Does(() =>
-{
- // Concatenating FilePathCollections should make sure we get unique FilePaths
- foreach(var package in GetFiles(BuildParameters.Paths.Directories.Packages + "/**/*") +
- GetFiles(BuildParameters.Paths.Directories.NuGetPackages + "/*") +
- GetFiles(BuildParameters.Paths.Directories.ChocolateyPackages + "/*"))
- {
- AppVeyor.UploadArtifact(package);
- }
-});
-
 BuildParameters.Tasks.ClearAppVeyorCacheTask = Task("Clear-AppVeyor-Cache")
  .Does(() =>
  RequireAddin(@"#addin nuget:?package=Cake.AppVeyor&version=3.0.0&loaddependencies=true
@@ -75,7 +60,7 @@ public class AppVeyorTagInfo : ITagInfo
 
  public bool IsTag { get; }
 
- public string Name { get; } 
+ public string Name { get; }
 }
 
 public class AppVeyorRepositoryInfo : IRepositoryInfo
@@ -101,17 +86,17 @@ public class AppVeyorPullRequestInfo : IPullRequestInfo
  IsPullRequest = appVeyor.Environment.PullRequest.IsPullRequest;
  }
 
- public bool IsPullRequest { get; } 
+ public bool IsPullRequest { get; }
 }
 
 public class AppVeyorBuildInfo : IBuildInfo
 {
  public AppVeyorBuildInfo(IAppVeyorProvider appVeyor)
  {
- Number = appVeyor.Environment.Build.Number;
+ Number = appVeyor.Environment.Build.Number.ToString();
  }
 
- public int Number { get; } 
+ public string Number { get; }
 }
 
 public class AppVeyorBuildProvider : IBuildProvider
@@ -121,11 +106,20 @@ public class AppVeyorBuildProvider : IBuildProvider
  Repository = new AppVeyorRepositoryInfo(appVeyor);
  PullRequest = new AppVeyorPullRequestInfo(appVeyor);
  Build = new AppVeyorBuildInfo(appVeyor);
+
+ _appVeyor = appVeyor;
  }
 
  public IRepositoryInfo Repository { get; }
 
  public IPullRequestInfo PullRequest { get; }
 
  public IBuildInfo Build { get; }
+
+ private readonly IAppVeyorProvider _appVeyor;
+
+ public void UploadArtifact(FilePath file)
+ {
+ _appVeyor.UploadArtifact(file); 
+ }
 }

Cake.Recipe/Content/azurepipelines.cake

@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+// BUILD PROVIDER
+///////////////////////////////////////////////////////////////////////////////
+
+public class AzurePipelinesTagInfo : ITagInfo
+{
+ public AzurePipelinesTagInfo(ITFBuildProvider tfBuild)
+ {
+ const string refTags = "refs/tags/";
+ // at the moment, there is no ability to know is it tag or not
+ IsTag = tfBuild.Environment.Repository.Branch.StartsWith(refTags);
+ Name = IsTag
+ ? tfBuild.Environment.Repository.Branch.Substring(refTags.Length)
+ : string.Empty;
+ }
+
+ public bool IsTag { get; }
+
+ public string Name { get; }
+}
+
+public class AzurePipelinesRepositoryInfo : IRepositoryInfo
+{
+ public AzurePipelinesRepositoryInfo(ITFBuildProvider tfBuild)
+ {
+ Branch = tfBuild.Environment.Repository.Branch;
+ Name = tfBuild.Environment.Repository.RepoName;
+ Tag = new AzurePipelinesTagInfo(tfBuild);
+ }
+
+ public string Branch { get; }
+
+ public string Name { get; }
+
+ public ITagInfo Tag { get; }
+}
+
+public class AzurePipelinesPullRequestInfo : IPullRequestInfo
+{
+ public AzurePipelinesPullRequestInfo(ITFBuildProvider tfBuild, ICakeEnvironment environment)
+ {
+ //todo: update to `tfBuild.Environment.PullRequest.IsPullRequest` after upgrade to 0.33.0
+ var value = environment.GetEnvironmentVariable("SYSTEM_PULLREQUEST_PULLREQUESTID");
+
+ IsPullRequest = !string.IsNullOrWhiteSpace(value) && int.TryParse(value, out var id)
+ ? id > 0
+ : false;
+ }
+
+ public bool IsPullRequest { get; }
+}
+
+public class AzurePipelinesBuildInfo : IBuildInfo
+{
+ public AzurePipelinesBuildInfo(ITFBuildProvider tfBuild)
+ {
+ Number = tfBuild.Environment.Build.Number;
+ }
+
+ public string Number { get; }
+}
+
+public class AzurePipelinesBuildProvider : IBuildProvider
+{
+ public AzurePipelinesBuildProvider(ITFBuildProvider tfBuild, ICakeEnvironment environment)
+ {
+ Build = new AzurePipelinesBuildInfo(tfBuild);
+ PullRequest = new AzurePipelinesPullRequestInfo(tfBuild, environment);
+ Repository = new AzurePipelinesRepositoryInfo(tfBuild);
+
+ _tfBuild = tfBuild;
+ }
+
+ public IRepositoryInfo Repository { get; }
+
+ public IPullRequestInfo PullRequest { get; }
+
+ public IBuildInfo Build { get; }
+
+ private readonly ITFBuildProvider _tfBuild;
+
+ public void UploadArtifact(FilePath file)
+ {
+ _tfBuild.Commands.UploadArtifact("artifacts", file, file.GetFilename().FullPath); 
+ }
+}

Cake.Recipe/Content/build.cake

@@ -408,8 +408,23 @@ BuildParameters.Tasks.PackageTask = Task("Package")
 BuildParameters.Tasks.DefaultTask = Task("Default")
  .IsDependentOn("Package");
 
+BuildParameters.Tasks.UploadArtifactsTask = Task("Upload-Artifacts")
+ .IsDependentOn("Package")
+ .WithCriteria(() => !BuildParameters.IsLocalBuild)
+ .WithCriteria(() => DirectoryExists(BuildParameters.Paths.Directories.NuGetPackages) || DirectoryExists(BuildParameters.Paths.Directories.ChocolateyPackages))
+ .Does(() =>
+{
+ // Concatenating FilePathCollections should make sure we get unique FilePaths
+ foreach(var package in GetFiles(BuildParameters.Paths.Directories.Packages + "/**/*") +
+ GetFiles(BuildParameters.Paths.Directories.NuGetPackages + "/*") +
+ GetFiles(BuildParameters.Paths.Directories.ChocolateyPackages + "/*"))
+ {
+ BuildParameters.BuildProvider.UploadArtifact(package);
+ }
+});
+
 BuildParameters.Tasks.AppVeyorTask = Task("AppVeyor")
- .IsDependentOn("Upload-AppVeyor-Artifacts")
+ .IsDependentOn("Upload-Artifacts")
  .IsDependentOn("Publish-MyGet-Packages")
  .IsDependentOn("Publish-Nuget-Packages")
  .IsDependentOn("Publish-GitHub-Release")

Cake.Recipe/Content/buildProvider.cake

@@ -21,7 +21,7 @@ public interface IPullRequestInfo
 
 public interface IBuildInfo
 {
- int Number { get; }
+ string Number { get; }
 }
 
 public interface IBuildProvider
@@ -31,10 +31,18 @@ public interface IBuildProvider
  IPullRequestInfo PullRequest { get; }
 
  IBuildInfo Build { get; }
+
+ void UploadArtifact(FilePath file);
 }
 
 public static IBuildProvider GetBuildProvider(ICakeContext context, BuildSystem buildSystem)
 {
+ //todo: need to be replaced to `IsRunningOnAzurePipelines || IsRunningOnAzurePipelinesHosted` after update to Cake 0.33.0
+ if (buildSystem.IsRunningOnTFS || buildSystem.IsRunningOnVSTS)
+ {
+ return new AzurePipelinesBuildProvider(buildSystem.TFBuild, context.Environment);
+ }
+
  // always fallback to AppVeyor
  return new AppVeyorBuildProvider(buildSystem.AppVeyor);
 }

Cake.Recipe/Content/tasks.cake

@@ -4,7 +4,7 @@ public class BuildTasks
  public CakeTaskBuilder InspectCodeTask { get; set; }
  public CakeTaskBuilder AnalyzeTask { get; set; }
  public CakeTaskBuilder PrintAppVeyorEnvironmentVariablesTask { get; set; }
- public CakeTaskBuilder UploadAppVeyorArtifactsTask { get; set; }
+ public CakeTaskBuilder UploadArtifactsTask { get; set; }
  public CakeTaskBuilder ClearAppVeyorCacheTask { get; set; }
  public CakeTaskBuilder ShowInfoTask { get; set; }
  public CakeTaskBuilder CleanTask { get; set; }