Merge branch 'master' into feature/support_for_wix_format

Author: asbjornu

build.cake

@@ -268,6 +268,16 @@ Task("Pack-Tfs")
     .Does<BuildParameters>((parameters) =>
 {
     var workDir = "./src/GitVersionTfsTask";
+    var idSuffix = parameters.IsStableRelease() ? "" : "-preview";
+    var titleSuffix = parameters.IsStableRelease() ? "" : "(Preview)";
+    var visibility = parameters.IsStableRelease() ? "Public" : "Preview";
+
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$idSuffix$", idSuffix);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$idSuffix$", idSuffix);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$titleSuffix$", titleSuffix);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$titleSuffix$", titleSuffix);
+    ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$visibility$", visibility);
+    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);
@@ -278,7 +288,7 @@ Task("Pack-Tfs")
     // build and pack
     NpmSet("progress", "false");
     NpmInstall(new NpmInstallSettings { WorkingDirectory = workDir, LogLevel = NpmLogLevel.Silent });
-    NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, ScriptName = "build", LogLevel = NpmLogLevel.Silent  });
+    NpmRunScript(new NpmRunScriptSettings { WorkingDirectory = workDir, ScriptName = "build", LogLevel = NpmLogLevel.Silent });
 
     TfxExtensionCreate(new TfxExtensionCreateSettings
     {
@@ -544,7 +554,7 @@ Task("Publish-Tfs")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishTfs,        "Publish-Tfs was disabled.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows,       "Publish-Tfs works only on Windows agents.")
     .WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Tfs works only on AzurePipeline.")
-    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(),   "Publish-Tfs works only for releases.")
+    .WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Tfs works only for releases.")
     .IsDependentOn("Pack-Tfs")
     .Does<BuildParameters>((parameters) =>
 {

src/GitVersionTfsTask/vss-extension.mono.json

@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
-    "id": "gitversion",
-    "name": "GitVersion",
+    "id": "gitversion$idSuffix$",
+    "name": "GitVersion$titleSuffix$",
     "publisher": "gittools",
     "public": true,
     "author": "GitVersion Contributors",
@@ -16,6 +16,9 @@
     "categories": [
         "Build and release"
     ],
+    "galleryFlags": [
+        "$visibility$"
+    ],
     "icons": {
         "default": "images/extension-icon.png"
     },
@@ -55,15 +58,14 @@
             "path": "overview.md"
         }
     },
-    "contributions": [
-        {
-            "id": "gitversion-task",
-            "type": "ms.vss-distributed-task.task",
-            "targets": [
-                "ms.vss-distributed-task.tasks"
-            ],
-            "properties": {
-                "name": "GitVersionTask"
-            }
-        }]
-}
+    "contributions": [{
+        "id": "gitversion-task",
+        "type": "ms.vss-distributed-task.task",
+        "targets": [
+            "ms.vss-distributed-task.tasks"
+        ],
+        "properties": {
+            "name": "GitVersionTask"
+        }
+    }]
+}

src/GitVersionTfsTask/vss-extension.netcore.json

@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
-    "id": "gitversion-netcore",
-    "name": "GitVersion (.NET Core)",
+    "id": "gitversion-netcore$idSuffix$",
+    "name": "GitVersion .NET Core$titleSuffix$",
     "publisher": "gittools",
     "public": true,
     "author": "GitVersion Contributors",
@@ -19,6 +19,9 @@
     "icons": {
         "default": "images/extension-icon.png"
     },
+    "galleryFlags": [
+        "$visibility$"
+    ],
     "tags": [
         "semver",
         "git",
@@ -55,15 +58,14 @@
             "path": "overview.md"
         }
     },
-    "contributions": [
-        {
-            "id": "gitversion-netcore-task",
-            "type": "ms.vss-distributed-task.task",
-            "targets": [
-                "ms.vss-distributed-task.tasks"
-            ],
-            "properties": {
-                "name": "GitVersionNetCoreTask"
-            }
-        }]
-}
+    "contributions": [{
+        "id": "gitversion-netcore-task",
+        "type": "ms.vss-distributed-task.task",
+        "targets": [
+            "ms.vss-distributed-task.tasks"
+        ],
+        "properties": {
+            "name": "GitVersionNetCoreTask"
+        }
+    }]
+}