GH-1527 - Azure DevOps add preview extensions

Author: arturcic

build.cake

@@ -280,8 +280,8 @@ Task("Pack-Tfs")
     ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$visibility$", visibility);
 
     // update version number
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$version$", parameters.Version.SemVersion);
-    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$version$", parameters.Version.SemVersion);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$version$", parameters.Version.TfxVersion);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$version$", parameters.Version.TfxVersion);
     UpdateTaskVersion(new FilePath(workDir + "/GitVersionTask/task.json"), parameters.Version.GitVersion);
     UpdateTaskVersion(new FilePath(workDir + "/GitVersionNetCoreTask/task.json"), parameters.Version.GitVersion);
 
@@ -290,21 +290,18 @@ Task("Pack-Tfs")
     NpmInstall(new NpmInstallSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
     NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, ScriptName = "build", LogLevel = NpmLogLevel.Silent });
 
-    TfxExtensionCreate(new TfxExtensionCreateSettings
+    var settings = new TfxExtensionCreateSettings
     {
         ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
         WorkingDirectory = workDir,
-        ManifestGlobs = new List<string>(){ "vss-extension.mono.json" },
         OutputPath = parameters.Paths.Directories.BuildArtifact
-    });
+    };
 
-    TfxExtensionCreate(new TfxExtensionCreateSettings
-    {
-        ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
-        WorkingDirectory = workDir,
-        ManifestGlobs = new List<string>(){ "vss-extension.netcore.json" },
-        OutputPath = parameters.Paths.Directories.BuildArtifact
-    });
+    settings.ManifestGlobs = new List<string>(){ "vss-extension.mono.json" };
+    TfxExtensionCreate(settings);
+
+    settings.ManifestGlobs = new List<string>(){ "vss-extension.netcore.json" };
+    TfxExtensionCreate(settings);
 });
 
 Task("Pack-Gem")
@@ -564,20 +561,15 @@ Task("Publish-Tfs")
     }
 
     var workDir = "./src/GitVersionTfsTask";
-    TfxExtensionPublish(parameters.Paths.Files.VsixOutputFilePath, new TfxExtensionPublishSettings
+    var settings = new TfxExtensionPublishSettings
     {
         ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
         AuthType = TfxAuthType.Pat,
         Token = token
-    });
+    };
 
-    var netCoreWorkDir = "./src/GitVersionTfsTask.NetCore";
-    TfxExtensionPublish(parameters.Paths.Files.VsixNetCoreOutputFilePath, new TfxExtensionPublishSettings
-    {
-        ToolPath = netCoreWorkDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
-        AuthType = TfxAuthType.Pat,
-        Token = token
-    });
+    TfxExtensionPublish(parameters.Paths.Files.VsixOutputFilePath, settings);
+    TfxExtensionPublish(parameters.Paths.Files.VsixNetCoreOutputFilePath, settings);
 })
 .OnError(exception =>
 {

build/parameters.cake

@@ -89,7 +89,7 @@ public class BuildParameters
     {
         Version = BuildVersion.Calculate(context, this, gitVersion);
 
-        Paths = BuildPaths.GetPaths(context, Configuration, Version);
+        Paths = BuildPaths.GetPaths(context, this, Configuration, Version);
 
         Packages = BuildPackages.GetPackages(
             Paths.Directories.NugetRoot,

build/paths.cake

@@ -5,6 +5,7 @@ public class BuildPaths
 
     public static BuildPaths GetPaths(
         ICakeContext context,
+        BuildParameters parameters,
         string configuration,
         BuildVersion version
         )
@@ -42,8 +43,10 @@ public class BuildPaths
 
         var releaseNotesOutputFilePath = buildArtifactDir.CombineWithFilePath("releasenotes.md");
         var gemOutputFilePath  = buildArtifactDir.CombineWithFilePath("gitversion-" + version.GemVersion + ".gem");
-        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + semVersion + ".vsix");
-        var vsixNetCoreOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-netcore-" + semVersion + ".vsix");
+
+        var tfsSuffix = parameters.IsStableRelease() ? "" : "preview-";
+        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + tfsSuffix + version.TfxVersion + ".vsix");
+        var vsixNetCoreOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-netcore-" + tfsSuffix + version.TfxVersion + ".vsix");
 
         // Directories
         var buildDirectories = new BuildDirectories(

build/version.cake

@@ -4,14 +4,17 @@ public class BuildVersion
     public string Version { get; private set; }
     public string SemVersion { get; private set; }
     public string GemVersion { get; private set; }
+    public string TfxVersion { get; private set; }
 
     public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters, GitVersion gitVersion)
     {
         var version = gitVersion.MajorMinorPatch;
         var semVersion = gitVersion.LegacySemVer;
+        var tfxVersion = gitVersion.MajorMinorPatch;
 
         if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData)) {
             semVersion += "-" + gitVersion.BuildMetaData;
+            tfxVersion += "." + gitVersion.BuildMetaData;
         }
 
         return new BuildVersion
@@ -20,6 +23,7 @@ public class BuildVersion
             Version    = version,
             SemVersion = semVersion,
             GemVersion = semVersion.Replace("-", "."),
+            TfxVersion = tfxVersion,
         };
     }
 }