re-structured TFS task

Author: arturcic

.gitignore

@@ -121,9 +121,7 @@ releaseArtifacts
 .cake
 artifacts
 /src/Docker/**/content
-/src/GitVersionTfsTask/lib
-/src/GitVersionTfsTask/GitVersion.exe
-/src/GitVersionTfsTask/LibGit2Sharp.dll.config
+/src/GitVersionTfsTask/scripts
 /src/GitVersionTfsTask/*.vsix
 /src/GitVersionRubyGem/*.gem
 /src/GitVersionRubyGem/bin/lib

build/paths.cake

@@ -36,10 +36,11 @@ public class BuildPaths
 
         var zipArtifactPathCoreClr = artifactsDir.CombineWithFilePath("GitVersion-bin-coreclr-v" + semVersion + ".zip");
         var zipArtifactPathDesktop = artifactsDir.CombineWithFilePath("GitVersion-bin-net40-v" + semVersion + ".zip");
-
         var testCoverageOutputFilePath = buildArtifactDir.CombineWithFilePath("TestResult.xml");
         var releaseNotesOutputFilePath = buildArtifactDir.CombineWithFilePath("releasenotes.md");
-        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + semVersion + ".vsix");
+
+        var vsixVersion = version.DotNetVersion;
+        var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + vsixVersion + ".vsix");
 
         var gemVersion = version.SemVersion.Replace("-", ".pre.");
         var gemOutputFilePath  = buildArtifactDir.CombineWithFilePath("gitversion-" + gemVersion + ".gem");

build/version.cake

@@ -4,16 +4,19 @@ public class BuildVersion
     public string SemVersion { get; private set; }
     public string NuGetVersion { get; private set; }
     public string DotNetAsterix { get; private set; }
+    public string DotNetVersion { get; private set; }
     public string PreReleaseTag { get; private set; }
 
     public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters, GitVersion gitVersion)
     {
         var version = gitVersion.MajorMinorPatch;
         var preReleaseTag = gitVersion.PreReleaseTag;
         var semVersion = gitVersion.LegacySemVerPadded;
+        var dotnetVersion = version;
 
         if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaDataPadded)) {
             semVersion += "." + gitVersion.BuildMetaDataPadded;
+            dotnetVersion += "." + gitVersion.BuildMetaDataPadded;
         }
 
         return new BuildVersion
@@ -22,6 +25,7 @@ public class BuildVersion
             SemVersion    = semVersion,
             NuGetVersion  = gitVersion.NuGetVersion,
             DotNetAsterix = semVersion.Substring(version.Length).TrimStart('-'),
+            DotNetVersion = dotnetVersion,
             PreReleaseTag = preReleaseTag
         };
     }

run.cake

@@ -117,7 +117,9 @@ Task("Clean")
 
     CleanDirectories("./src/**/bin/" + parameters.Configuration);
     CleanDirectories("./src/**/obj");
+    CleanDirectories("./src/GitVersionTfsTask/scripts/**");
 
+    DeleteFiles("src/GitVersionTfsTask/*.vsix");
     DeleteFiles("src/GitVersionRubyGem/*.gem");
 
     CleanDirectories(parameters.Paths.Directories.ToClean);
@@ -231,13 +233,15 @@ Task("Copy-Files")
     PublishILRepackedGitVersionExe(false, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergDir, cmdlineDir, parameters.Configuration, dotnetVersion);
 
     // Vsix
-    var tfsPath = new DirectoryPath("./src/GitVersionTfsTask");
+    var tfsPath = new DirectoryPath("./src/GitVersionTfsTask/scripts");
+    EnsureDirectoryExists(tfsPath);
     CopyFileToDirectory(portableDir + "/" + "LibGit2Sharp.dll.config", tfsPath);
     CopyFileToDirectory(portableDir + "/" + "GitVersion.exe", tfsPath);
     CopyDirectory(portableDir.Combine("lib"), tfsPath.Combine("lib"));
 
     // Ruby Gem
     var gemPath = new DirectoryPath("./src/GitVersionRubyGem/bin");
+    EnsureDirectoryExists(gemPath);
     CopyFileToDirectory(portableDir + "/" + "LibGit2Sharp.dll.config", gemPath);
     CopyFileToDirectory(portableDir + "/" + "GitVersion.exe", gemPath);
     CopyDirectory(portableDir.Combine("lib"), gemPath.Combine("lib"));
@@ -250,13 +254,14 @@ Task("Pack-Tfs")
     var workDir = "./src/GitVersionTfsTask";
 
     // update version number
-    ReplaceTextInFile(new FilePath(workDir + "/manifest.json"), "$version$", parameters.Version.SemVersion);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.json"), "$version$", parameters.Version.DotNetVersion);
 
-    var taskJson = ParseJsonFromFile(workDir + "/task.json");
+    var taskJsonFile = new FilePath(workDir + "/GitVersionTask/task.json");
+    var taskJson = ParseJsonFromFile(taskJsonFile);
     taskJson["version"]["Major"] = gitVersion.Major.ToString();
     taskJson["version"]["Minor"] = gitVersion.Minor.ToString();
     taskJson["version"]["Patch"] = gitVersion.Patch.ToString();
-    SerializeJsonToPrettyFile(workDir + "/task.json", taskJson);
+    SerializeJsonToPrettyFile(taskJsonFile, taskJson);
 
     // build and pack
     NpmSet("progress", "false");
@@ -267,7 +272,7 @@ Task("Pack-Tfs")
     {
         ToolPath = workDir + "/node_modules/.bin/" + (parameters.IsRunningOnWindows ? "tfx.cmd" : "tfx"),
         WorkingDirectory = workDir,
-        ManifestGlobs = new List<string>(){ "manifest.json" },
+        ManifestGlobs = new List<string>(){ "vss-extension.json" },
         OutputPath = parameters.Paths.Directories.BuildArtifact
     });
 });
@@ -467,8 +472,6 @@ Task("Publish-Tfs")
     .IsDependentOn("Pack-Tfs")
     .Does(() =>
 {
-    Information("Publish-Tfs");
-    return;
     var token = parameters.Credentials.Tfx.Token;
     if(string.IsNullOrEmpty(token)) {
         throw new InvalidOperationException("Could not resolve Tfx token.");

src/Docker/Readme.md

@@ -1,4 +1,4 @@
-There are 4 variants of docker image :
+# There are 4 variants of docker image :
 
 - based on **microsoft/dotnet-framework:4.7.2-runtime** - Windows Full FX
 - based on **microsoft/dotnet:2.1-runtime** - Windows dotnet core