Skip to content

Commit a7c5a42

Browse files
arturcicarturcic
committed
(cleanup) renamed tfs -> vsix
1 parent 02dac8e commit a7c5a42

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎build.cake

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,16 @@ Task("Copy-Files")
266266
PublishILRepackedGitVersionExe(false, parameters.Paths.Directories.ArtifactsBinFullFx, ilMergeDir, cmdlineDir, parameters.Configuration, parameters.FullFxVersion);
267267

268268
// Vsix
269-
var tfsPath = new DirectoryPath("./src/GitVersionTfsTask/GitVersionTask");
270-
EnsureDirectoryExists(tfsPath);
271-
CopyFileToDirectory(portableDir + "/" + "LibGit2Sharp.dll.config", tfsPath);
272-
CopyFileToDirectory(portableDir + "/" + "GitVersion.exe", tfsPath);
273-
CopyDirectory(portableDir.Combine("lib"), tfsPath.Combine("lib"));
269+
var vsixPath = new DirectoryPath("./src/GitVersionTfsTask/GitVersionTask");
270+
EnsureDirectoryExists(vsixPath);
271+
CopyFileToDirectory(portableDir + "/" + "LibGit2Sharp.dll.config", vsixPath);
272+
CopyFileToDirectory(portableDir + "/" + "GitVersion.exe", vsixPath);
273+
CopyDirectory(portableDir.Combine("lib"), vsixPath.Combine("lib"));
274274

275275
// Vsix dotnet core
276-
var tfsCoreFxPath = new DirectoryPath("./src/GitVersionTfsTask/GitVersionNetCoreTask");
277-
EnsureDirectoryExists(tfsCoreFxPath);
278-
CopyDirectory(coreFxDir, tfsCoreFxPath.Combine("netcore"));
276+
var vsixCoreFxPath = new DirectoryPath("./src/GitVersionTfsTask/GitVersionNetCoreTask");
277+
EnsureDirectoryExists(vsixCoreFxPath);
278+
CopyDirectory(coreFxDir, vsixCoreFxPath.Combine("netcore"));
279279

280280
// Ruby Gem
281281
var gemPath = new DirectoryPath("./src/GitVersionRubyGem/bin");
@@ -285,7 +285,7 @@ Task("Copy-Files")
285285
CopyDirectory(portableDir.Combine("lib"), gemPath.Combine("lib"));
286286
});
287287

288-
Task("Pack-Tfs")
288+
Task("Pack-Vsix")
289289
.IsDependentOn("Copy-Files")
290290
.Does<BuildParameters>((parameters) =>
291291
{
@@ -304,8 +304,8 @@ Task("Pack-Tfs")
304304
ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$visibility$", visibility);
305305

306306
// update version number
307-
ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$version$", parameters.Version.TfxVersion);
308-
ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$version$", parameters.Version.TfxVersion);
307+
ReplaceTextInFile(new FilePath(workDir + "/vss-extension.mono.json"), "$version$", parameters.Version.VsixVersion);
308+
ReplaceTextInFile(new FilePath(workDir + "/vss-extension.netcore.json"), "$version$", parameters.Version.VsixVersion);
309309
UpdateTaskVersion(new FilePath(workDir + "/GitVersionTask/task.json"), taskIdFullFx, parameters.Version.GitVersion);
310310
UpdateTaskVersion(new FilePath(workDir + "/GitVersionNetCoreTask/task.json"), taskIdCoreFx, parameters.Version.GitVersion);
311311

@@ -463,7 +463,7 @@ Task("Docker-Test")
463463
});
464464

465465
Task("Pack")
466-
.IsDependentOn("Pack-Tfs")
466+
.IsDependentOn("Pack-Vsix")
467467
.IsDependentOn("Pack-Gem")
468468
.IsDependentOn("Pack-Nuget")
469469
.IsDependentOn("Pack-Chocolatey")
@@ -602,12 +602,12 @@ Task("Publish-AzurePipeline")
602602
publishingError = true;
603603
});
604604

605-
Task("Publish-Tfs")
606-
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishTfs, "Publish-Tfs was disabled.")
607-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Tfs works only on Windows agents.")
608-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Tfs works only on AzurePipeline.")
609-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Tfs works only for releases.")
610-
.IsDependentOn("Pack-Tfs")
605+
Task("Publish-Vsix")
606+
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishVsix, "Publish-Vsix was disabled.")
607+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Vsix works only on Windows agents.")
608+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Vsix works only on AzurePipeline.")
609+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Vsix works only for releases.")
610+
.IsDependentOn("Pack-Vsix")
611611
.Does<BuildParameters>((parameters) =>
612612
{
613613
var token = parameters.Credentials.Tfx.Token;
@@ -628,7 +628,7 @@ Task("Publish-Tfs")
628628
})
629629
.OnError(exception =>
630630
{
631-
Information("Publish-Tfs Task failed, but continuing with next Task...");
631+
Information("Publish-Vsix Task failed, but continuing with next Task...");
632632
Error(exception.Dump());
633633
publishingError = true;
634634
});
@@ -779,7 +779,7 @@ Task("Publish")
779779
.IsDependentOn("Publish-Coverage")
780780
.IsDependentOn("Publish-NuGet")
781781
.IsDependentOn("Publish-Chocolatey")
782-
.IsDependentOn("Publish-Tfs")
782+
.IsDependentOn("Publish-Vsix")
783783
.IsDependentOn("Publish-Gem")
784784
.IsDependentOn("Publish-DockerHub")
785785
.Finally(() =>

‎build/parameters.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class BuildParameters
1313

1414
public bool EnabledUnitTests { get; private set; }
1515
public bool EnabledPublishGem { get; private set; }
16-
public bool EnabledPublishTfs { get; private set; }
16+
public bool EnabledPublishVsix { get; private set; }
1717
public bool EnabledPublishNuget { get; private set; }
1818
public bool EnabledPublishChocolatey { get; private set; }
1919
public bool EnabledPublishDocker { get; private set; }
@@ -64,7 +64,7 @@ public class BuildParameters
6464

6565
EnabledUnitTests = IsEnabled(context, "ENABLED_UNIT_TESTS"),
6666
EnabledPublishGem = IsEnabled(context, "ENABLED_PUBLISH_GEM"),
67-
EnabledPublishTfs = IsEnabled(context, "ENABLED_PUBLISH_TFS"),
67+
EnabledPublishVsix = IsEnabled(context, "ENABLED_PUBLISH_VSIX"),
6868
EnabledPublishNuget = IsEnabled(context, "ENABLED_PUBLISH_NUGET"),
6969
EnabledPublishChocolatey = IsEnabled(context, "ENABLED_PUBLISH_CHOCOLATEY"),
7070
EnabledPublishDocker = IsEnabled(context, "ENABLED_PUBLISH_DOCKER"),

‎build/paths.cake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public class BuildPaths
4444
var releaseNotesOutputFilePath = buildArtifactDir.CombineWithFilePath("releasenotes.md");
4545
var gemOutputFilePath = buildArtifactDir.CombineWithFilePath("gitversion-" + version.GemVersion + ".gem");
4646

47-
var tfsSuffix = parameters.IsStableRelease() ? "" : "preview-";
48-
var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + tfsSuffix + version.TfxVersion + ".vsix");
49-
var vsixCoreFxOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-netcore-" + tfsSuffix + version.TfxVersion + ".vsix");
47+
var vsixSuffix = parameters.IsStableRelease() ? "" : "preview-";
48+
var vsixOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-" + vsixSuffix + version.VsixVersion + ".vsix");
49+
var vsixCoreFxOutputFilePath = buildArtifactDir.CombineWithFilePath("gittools.gitversion-netcore-" + vsixSuffix + version.VsixVersion + ".vsix");
5050

5151
// Directories
5252
var buildDirectories = new BuildDirectories(

‎build/version.cake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ public class BuildVersion
55
public string Milestone { get; private set; }
66
public string SemVersion { get; private set; }
77
public string GemVersion { get; private set; }
8-
public string TfxVersion { get; private set; }
8+
public string VsixVersion { get; private set; }
99

1010
public static BuildVersion Calculate(ICakeContext context, BuildParameters parameters, GitVersion gitVersion)
1111
{
1212
var version = gitVersion.MajorMinorPatch;
1313
var semVersion = gitVersion.LegacySemVer;
14-
var tfxVersion = gitVersion.MajorMinorPatch;
14+
var vsixVersion = gitVersion.MajorMinorPatch;
1515

1616
if (!string.IsNullOrWhiteSpace(gitVersion.BuildMetaData)) {
1717
semVersion += "-" + gitVersion.BuildMetaData;
18-
tfxVersion += "." + DateTime.UtcNow.ToString("yyMMddHH");
18+
vsixVersion += "." + DateTime.UtcNow.ToString("yyMMddHH");
1919
}
2020

2121
return new BuildVersion
@@ -25,7 +25,7 @@ public class BuildVersion
2525
Version = version,
2626
SemVersion = semVersion,
2727
GemVersion = semVersion.Replace("-", "."),
28-
TfxVersion = tfxVersion,
28+
VsixVersion = vsixVersion,
2929
};
3030
}
3131
}

0 commit comments

Comments
 (0)