Skip to content

Commit 990e937

Browse files
committed
(build) centralize the location of the dotnet tools versioning
1 parent d1c3359 commit 990e937

File tree

8 files changed

+49
-9
lines changed

8 files changed

+49
-9
lines changed

build/artifacts/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1717
}
1818
}

build/build/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.0.0"));
17-
services.UseTool(new Uri("dotnet:?package=Codecov.Tool&version=1.13.0"));
18-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseNugetTool(Tools.NugetCmd, Tools.Versions[Tools.NugetCmd]);
17+
services.UseDotnetTool(Tools.Codecov, Tools.Versions[Tools.Codecov]);
18+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1919
}
2020
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using Microsoft.Extensions.DependencyInjection;
2+
3+
namespace Common.Utilities;
4+
5+
public static class ServicesExtensions
6+
{
7+
public static IServiceCollection UseDotnetTool(this IServiceCollection services, string toolName, string toolVersion)
8+
{
9+
services.UseTool(new Uri($"dotnet:?package={toolName}&version={toolVersion}"));
10+
return services;
11+
}
12+
13+
public static IServiceCollection UseNugetTool(this IServiceCollection services, string toolName, string toolVersion)
14+
{
15+
services.UseTool(new Uri($"nuget:?package={toolName}&version={toolVersion}"));
16+
return services;
17+
}
18+
}

build/common/Utilities/Tools.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
namespace Common.Utilities;
2+
3+
public class Tools
4+
{
5+
public const string NugetCmd = "NuGet.CommandLine";
6+
7+
public const string GitVersion = "GitVersion.Tool";
8+
public const string GitReleaseManager = "GitReleaseManager.Tool";
9+
public const string Codecov = "Codecov.Tool";
10+
public const string Wyam2 = "Wyam2.Tool";
11+
12+
public static readonly Dictionary<string, string> Versions = new()
13+
{
14+
{ NugetCmd, "6.0.0" },
15+
16+
{ GitVersion, "5.8.3" },
17+
{ GitReleaseManager, "0.13.0" },
18+
{ Codecov, "1.13.0" },
19+
{ Wyam2, "3.0.0-rc3&prerelease" },
20+
};
21+
}

build/docker/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1717
}
1818
}

build/docs/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=Wyam2.Tool&version=3.0.0-rc2&prerelease"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
17+
services.UseDotnetTool(Tools.Wyam2, Tools.Versions[Tools.Wyam2]);
1718
}
1819
}

build/publish/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
1717
}
1818
}

build/release/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void Configure(IServiceCollection services)
1313

1414
services.UseWorkingDirectory(Extensions.GetRootDirectory());
1515

16-
services.UseTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.8.2"));
17-
services.UseTool(new Uri("dotnet:?package=GitReleaseManager.Tool&version=0.13.0"));
16+
services.UseDotnetTool(Tools.GitVersion, Tools.Versions[Tools.GitVersion]);
17+
services.UseDotnetTool(Tools.GitReleaseManager, Tools.Versions[Tools.GitReleaseManager]);
1818
}
1919
}

0 commit comments

Comments
 (0)