Skip to content

Commit e09eca9

Browse files
MrHinshMrHinsh
authored
Use GitVersion in the tool (#1726)
* Updated to reflect the version number from Git in the local run of the tool. * Update * Update * Added some git info. * Update all dependancies
1 parent 06bc3d1 commit e09eca9

File tree

14 files changed

+130
-18
lines changed

14 files changed

+130
-18
lines changed

‎docs/Reference/Generated/MigrationTools.Host.xml‎

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/MigrationTools.Clients.AzureDevops.ObjectModel.Tests/MigrationTools.Clients.AzureDevops.ObjectModel.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
1313
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1515
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="16.205.1" />
1616
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1717
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
1818
<PackageReference Include="coverlet.collector" Version="6.0.0">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="Serilog" Version="3.0.1" />
22+
<PackageReference Include="Serilog" Version="3.1.0" />
2323
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
2424
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
2525
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />

‎src/MigrationTools.Clients.AzureDevops.Rest.Tests/MigrationTools.Clients.AzureDevops.Rest.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1313
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
1414
<PackageReference Include="coverlet.collector" Version="6.0.0">

‎src/MigrationTools.Clients.AzureDevops.Rest/MigrationTools.Clients.AzureDevops.Rest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
14-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
14+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/MigrationTools.Clients.FileSystem.Tests/MigrationTools.Clients.FileSystem.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
1313
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1515
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1616
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
1717
<PackageReference Include="coverlet.collector" Version="6.0.0">

‎src/MigrationTools.Clients.InMemory.Tests/MigrationTools.Clients.InMemory.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
1313
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1515
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1616
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
1717
<PackageReference Include="coverlet.collector" Version="6.0.0">

‎src/MigrationTools.Host.Tests/MigrationTools.Host.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2020
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
2121
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
2222
<PackageReference Include="coverlet.collector" Version="6.0.0">

‎src/MigrationTools.Host/MigrationToolHost.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ public static IHostBuilder CreateDefaultBuilder(string[] args)
151151
private static string GetVersionTextForLog()
152152
{
153153
Version runningVersion = DetectVersionService2.GetRunningVersion();
154-
string textVersion = $"v" + ((runningVersion.Major > 1) ? runningVersion : "Local");
155-
return textVersion;
154+
string textVersion = ((runningVersion.Major > 1) ? "$v" + runningVersion : ThisAssembly.Git.BaseTag + "-" + ThisAssembly.Git.Commits + "-local");
155+
return textVersion;
156156
}
157157

158158
public static async Task RunMigrationTools(this IHostBuilder hostBuilder, string[] args)

‎src/MigrationTools.Host/MigrationTools.Host.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,29 @@
88
<DocumentationFile>..\..\docs\Reference\Generated\MigrationTools.Host.xml</DocumentationFile>
99
</PropertyGroup>
1010

11+
<PropertyGroup>
12+
<GitVersion>false</GitVersion>
13+
</PropertyGroup>
14+
1115
<ItemGroup>
1216
<PackageReference Include="CommandLineParser" Version="2.9.1" />
17+
<PackageReference Include="GitInfo" Version="3.3.3">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
1321
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
1422
<PackageReference Include="Microsoft.ApplicationInsights.TraceListener" Version="2.21.0" />
1523
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.21.0" />
1624
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
1725
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
1826
<PackageReference Include="NuGet.Protocol" Version="6.7.0" />
19-
<PackageReference Include="Serilog" Version="3.0.1" />
27+
<PackageReference Include="Serilog" Version="3.1.0" />
2028
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
2129
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
2230
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
2331
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
2432
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
25-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
33+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
2634
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2735
<PackageReference Include="WGet.NET" Version="3.2.0" />
2836
</ItemGroup>

‎src/MigrationTools.Host/StartupService.cs‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,17 @@ public void RunStartupLogic(string[] args)
5656
Log.Information(" Running: {RunningVersion}", _detectVersionService.RunningVersion);
5757
Log.Information(" Installed: {InstalledVersion}", _detectVersionService.InstalledVersion);
5858
Log.Information(" Available: {AvailableVersion}", _detectVersionService.AvailableVersion);
59-
60-
59+
60+
if (_detectVersionService.RunningVersion.Major == 0)
61+
{
62+
Log.Information("Git Info:");
63+
Log.Information(" Repo: {GitRepositoryUrl}", ThisAssembly.Git.RepositoryUrl);
64+
Log.Information(" Tag: {GitTag}", ThisAssembly.Git.Tag);
65+
Log.Information(" Branch: {GitBranch}", ThisAssembly.Git.Branch);
66+
Log.Information(" Commits: {GitCommits}", ThisAssembly.Git.Commits);
67+
68+
}
69+
6170
if (!_detectVersionService.IsPackageManagerInstalled)
6271
{
6372
Log.Warning("Windows Client: The Windows Package Manager is not installed, we use it to determine if you have the latest version, and to make sure that this application is up to date. You can download and install it from https://aka.ms/getwinget. After which you can call `winget install {PackageId}` from the Windows Terminal to get a manged version of this program.", _detectVersionService.PackageId);

0 commit comments

Comments
 (0)