Migrate depregated TFBuild references to AzurePipelines (#22)

stormid · Oct 30, 2020 · b77faf2 · b77faf2
1 parent ee4aa18
commit b77faf2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/.cake/CI-Azure-DevOps.cake b/.cake/CI-Azure-DevOps.cake
@@ -1,34 +1,34 @@
 #load "Configuration.cake"
 
 Task("CI:VSTS:UploadArtifacts")
-    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines)
+    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines)
     .IsDependentOn("Publish")
     .IsDependeeOf("CI:UploadArtifacts")
     .Does<Configuration>(config => 
 {
     Information("Uploading artifacts from {0}", config.Artifacts.Root);
-    TFBuild.Commands.UploadArtifact("artifacts", config.Artifacts.Root.ToString(), "artifacts");
+    AzurePipelines.Commands.UploadArtifact("artifacts", config.Artifacts.Root.ToString(), "artifacts");
 });
 
 Task("CI:VSTS:UpdateBuildNumber")
     .IsDependeeOf("CI:UpdateBuildNumber")
-    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines)
+    .WithCriteria<Configuration>((ctx, config) => BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines)
     .Does<Configuration>(config =>
 {
     Information(
         @"Repository:
         Branch: {0}
         SourceVersion: {1}
         Shelveset: {2}",
-        BuildSystem.TFBuild.Environment.Repository.Branch,
-        BuildSystem.TFBuild.Environment.Repository.SourceVersion,
-        BuildSystem.TFBuild.Environment.Repository.Shelveset
+        BuildSystem.AzurePipelines.Environment.Repository.SourceBranchName,
+        BuildSystem.AzurePipelines.Environment.Repository.SourceVersion,
+        BuildSystem.AzurePipelines.Environment.Repository.Shelveset
         );    
 
-    TFBuild.Commands.UpdateBuildNumber(config.Version.FullSemVersion);
-    TFBuild.Commands.SetVariable("GitVersion.Version", config.Version.Version);
-    TFBuild.Commands.SetVariable("GitVersion.SemVer", config.Version.SemVersion);
-    TFBuild.Commands.SetVariable("GitVersion.InformationalVersion", config.Version.InformationalVersion);
-    TFBuild.Commands.SetVariable("GitVersion.FullSemVer", config.Version.FullSemVersion);
-    TFBuild.Commands.SetVariable("Cake.Version", config.Version.CakeVersion);
+    AzurePipelines.Commands.UpdateBuildNumber(config.Version.FullSemVersion);
+    AzurePipelines.Commands.SetVariable("GitVersion.Version", config.Version.Version);
+    AzurePipelines.Commands.SetVariable("GitVersion.SemVer", config.Version.SemVersion);
+    AzurePipelines.Commands.SetVariable("GitVersion.InformationalVersion", config.Version.InformationalVersion);
+    AzurePipelines.Commands.SetVariable("GitVersion.FullSemVer", config.Version.FullSemVersion);
+    AzurePipelines.Commands.SetVariable("Cake.Version", config.Version.CakeVersion);
 });
diff --git a/.cake/Test-DotNetCore.cake b/.cake/Test-DotNetCore.cake
@@ -34,13 +34,13 @@ Task("Test:DotNetCore")
     var testResults = GetFiles($"{testResultsRoot}/**/*.xml").ToArray();
     if(testResults.Any()) 
     {
-        if(BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines) 
+        if(BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines) 
         {
-            TFBuild.Commands.PublishTestResults(new TFBuildPublishTestResultsData() {
+            AzurePipelines.Commands.PublishTestResults(new AzurePipelinesPublishTestResultsData() {
                 Configuration = config.Solution.BuildConfiguration,
                 MergeTestResults = true,
                 TestResultsFiles = testResults,
-                TestRunner = TFTestRunnerType.VSTest
+                TestRunner = AzurePipelinesTestRunnerType.VSTest
             });    
         }
     }

diff --git a/.cake/Test-NUnit2.cake b/.cake/Test-NUnit2.cake
@@ -36,13 +36,13 @@ Task("Test:NUnit")
     var testResults = GetFiles($"{config.Artifacts.Root}/test-results/**/*.xml").ToArray();
     if(testResults.Any()) 
     {
-        if(BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines) 
+        if(BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines) 
         {
-            TFBuild.Commands.PublishTestResults(new TFBuildPublishTestResultsData() {
+            AzurePipelines.Commands.PublishTestResults(new AzurePipelinesPublishTestResultsData() {
                 Configuration = config.Solution.BuildConfiguration,
                 MergeTestResults = true,
                 TestResultsFiles = testResults,
-                TestRunner = TFTestRunnerType.VSTest
+                TestRunner = AzurePipelinesTestRunnerType.VSTest
             });    
         }
     }

diff --git a/.cake/Test-NUnit3.cake b/.cake/Test-NUnit3.cake
@@ -40,13 +40,13 @@ Task("Test:NUnit")
     var testResults = GetFiles($"{config.Artifacts.Root}/test-results/**/*.xml").ToArray();
     if(testResults.Any()) 
     {
-        if(BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines) 
+        if(BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines) 
         {
-            TFBuild.Commands.PublishTestResults(new TFBuildPublishTestResultsData() {
+            AzurePipelines.Commands.PublishTestResults(new AzurePipelinesPublishTestResultsData() {
                 Configuration = config.Solution.BuildConfiguration,
                 MergeTestResults = true,
                 TestResultsFiles = testResults,
-                TestRunner = TFTestRunnerType.VSTest
+                TestRunner = AzurePipelinesTestRunnerType.VSTest
             });    
         }
     }

diff --git a/.cake/Test-XUnit2.cake b/.cake/Test-XUnit2.cake
@@ -36,13 +36,13 @@ Task("Test:XUnit2")
     var testResults = GetFiles($"{config.Artifacts.Root}/test-results/**/*.xml").ToArray();
     if(testResults.Any()) 
     {
-        if(BuildSystem.IsRunningOnAzurePipelinesHosted || TFBuild.IsRunningOnAzurePipelines) 
+        if(BuildSystem.IsRunningOnAzurePipelinesHosted || AzurePipelines.IsRunningOnAzurePipelines) 
         {
-            TFBuild.Commands.PublishTestResults(new TFBuildPublishTestResultsData() {
+            AzurePipelines.Commands.PublishTestResults(new AzurePipelinesPublishTestResultsData() {
                 Configuration = config.Solution.BuildConfiguration,
                 MergeTestResults = true,
                 TestResultsFiles = testResults,
-                TestRunner = TFTestRunnerType.VSTest
+                TestRunner = AzurePipelinesTestRunnerType.VSTest
             });    
         }
     }