Skip to content

Commit c8278f2

Browse files
MrHinshMrHinsh
authored
Use central package management and update all references (#2508)
## Changes in this PR: - Set up some code style in `.editorconfig`. - Consolidate all references into `Directory.Packages.props`. ## Fixing tests After switching to .NET Framework 4.7.2, `MigrationToolVersionInfoTests` were failing. It seems, that in this framework when running tests inside Visual Studio. The problem was in `MigrationToolVersionInfo` constructor, where `Assembly.GetEntryAssembly()` returned `null` and so `FileVersionInfo.GetVersionInfo` throwed an exception. The problem was, that `FakeMigrationToolVersionInfo` inherited from `MigrationToolVersionInfo` and so that constructor was automatically called. I believe, this logic is not needed in fake class, so I removed inheritance and implemented just the interface.
2 parents 78b8978 + 8a07e34 commit c8278f2

File tree

22 files changed

+226
-221
lines changed

22 files changed

+226
-221
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ insert_final_newline = true
2424
[*.csproj]
2525
tab_width = 2
2626
indent_size = 2
27+
indent_style = space
2728

2829
[*.props]
2930
tab_width = 2
3031
indent_size = 2
32+
indent_style = space
3133

3234
[*.cs]
3335
indent_style = space

‎Directory.Build.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.0.0.0</Version>
4-
<FileVersion>0.0.0.0</FileVersion>
5-
<InformationalVersion>0.0.0-local</InformationalVersion>
3+
<Version>0.0.0.0</Version>
4+
<FileVersion>0.0.0.0</FileVersion>
5+
<InformationalVersion>0.0.0-local</InformationalVersion>
66
<Authors>Martin Hinshelwood</Authors>
77
<Company>naked Agility with Martin Hinshelwood</Company>
88
<Product>MigrationTools.CommandLine</Product>
9-
<LangVersion>default</LangVersion>
9+
<LangVersion>default</LangVersion>
1010
<NoWarn>1701;1702;1591</NoWarn>
11+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
15+
<PackageReference Include="Newtonsoft.Json" />
1516
</ItemGroup>
1617
</Project>

‎Directory.Packages.props‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
4+
<PackageVersion Include="Ben.Demystifier" Version="0.4.1" />
5+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
6+
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
7+
<PackageVersion Include="Elmah.Io.Client" Version="5.1.76" />
8+
<PackageVersion Include="GitInfo" Version="3.3.5" />
9+
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
10+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
11+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
12+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
13+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
14+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.3.2" />
15+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.4" />
16+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
22+
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
23+
<PackageVersion Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
25+
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.Common.Contracts" Version="19.225.1" />
26+
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
27+
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
28+
<PackageVersion Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
29+
<PackageVersion Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
30+
<PackageVersion Include="Microsoft.VisualStudio.Services.ServiceEndpoints.WebApi" Version="19.225.1" />
31+
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.0" />
32+
<PackageVersion Include="MSTest.TestFramework" Version="3.6.0" />
33+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
34+
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
35+
<PackageVersion Include="NuGet.Protocol" Version="6.11.0" />
36+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
37+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
38+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
39+
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.6" />
40+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
41+
<PackageVersion Include="OxyPlot.Core" Version="2.2.0" />
42+
<PackageVersion Include="OxyPlot.ImageSharp" Version="2.2.0" />
43+
<PackageVersion Include="Serilog" Version="4.0.1" />
44+
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
45+
<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
46+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
47+
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
48+
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.2" />
49+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
50+
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
51+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
52+
<PackageVersion Include="Serilog.Sinks.InMemory" Version="0.11.0" />
53+
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
54+
<PackageVersion Include="Spectre.Console.Extensions.Hosting" Version="0.2.0" />
55+
<PackageVersion Include="Spectre.Console.Json" Version="0.49.1" />
56+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
57+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
58+
<PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
59+
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
60+
<PackageVersion Include="TfsUrlParser" Version="1.5.0" />
61+
<PackageVersion Include="WGet.NET" Version="4.2.0" />
62+
<PackageVersion Include="YamlDotNet" Version="16.1.0" />
63+
</ItemGroup>
64+
</Project>

‎MigrationTools.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2626
.gitignore = .gitignore
2727
appsettings.json = appsettings.json
2828
Directory.Build.props = Directory.Build.props
29+
Directory.Packages.props = Directory.Packages.props
2930
GitVersion.yml = GitVersion.yml
3031
mkdocs.yml = mkdocs.yml
3132
README.md = README.md

‎docs/MigrationTools.Documentation.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -10,8 +10,4 @@
1010
<None Include="*.md" />
1111
</ItemGroup>
1212

13-
<ItemGroup>
14-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
15-
</ItemGroup>
16-
1713
</Project>

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87

@@ -11,11 +10,11 @@
1110
</ItemGroup>
1211

1312
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.2">
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
15+
<PackageReference Include="MSTest.TestAdapter" />
16+
<PackageReference Include="MSTest.TestFramework" />
17+
<PackageReference Include="coverlet.collector">
1918
<PrivateAssets>all</PrivateAssets>
2019
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2120
</PackageReference>
@@ -27,8 +26,4 @@
2726
<ProjectReference Include="..\MigrationTools\MigrationTools.csproj" />
2827
</ItemGroup>
2928

30-
<ItemGroup>
31-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
32-
</ItemGroup>
33-
3429
</Project>

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<Product>MigrationTools.Clients.AzureDevops.Rest</Product>
66
</PropertyGroup>
77

@@ -14,20 +14,16 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
18-
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
19-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
20-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
21-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
17+
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
18+
<PackageReference Include="Microsoft.TeamFoundationServer.Client" />
19+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" />
20+
<PackageReference Include="OpenTelemetry.Exporter.Console" />
21+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
22+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
2323
</ItemGroup>
2424

2525
<ItemGroup>
2626
<ProjectReference Include="..\MigrationTools\MigrationTools.csproj" />
2727
</ItemGroup>
2828

29-
<ItemGroup>
30-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
31-
</ItemGroup>
32-
3329
</Project>

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
65
<IsPackable>false</IsPackable>
7-
86
<RootNamespace>MigrationTools.Tests</RootNamespace>
97
</PropertyGroup>
108

119
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
15-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
16-
<PackageReference Include="coverlet.collector" Version="6.0.2">
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="MSTest.TestAdapter" />
13+
<PackageReference Include="MSTest.TestFramework" />
14+
<PackageReference Include="coverlet.collector">
1715
<PrivateAssets>all</PrivateAssets>
1816
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1917
</PackageReference>
@@ -24,7 +22,4 @@
2422
<ProjectReference Include="..\MigrationTools.Shadows\MigrationTools.Shadows.csproj" />
2523
</ItemGroup>
2624

27-
<ItemGroup>
28-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
29-
</ItemGroup>
3025
</Project>

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<Product>MigrationTools.Sinks.FileSystem</Product>
66
<RootNamespace>MigrationTools</RootNamespace>
77
</PropertyGroup>
@@ -15,18 +15,14 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
19-
<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
20-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
21-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
18+
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" />
19+
<PackageReference Include="OpenTelemetry.Exporter.Console" />
20+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
21+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
2525
<ProjectReference Include="..\MigrationTools\MigrationTools.csproj" />
2626
</ItemGroup>
2727

28-
<ItemGroup>
29-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
30-
</ItemGroup>
31-
3228
</Project>

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,24 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5-
65
<IsPackable>false</IsPackable>
7-
86
<RootNamespace>MigrationTools.Tests</RootNamespace>
97
</PropertyGroup>
108

119
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
14-
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.0" />
16-
<PackageReference Include="MSTest.TestFramework" Version="3.6.0" />
17-
<PackageReference Include="coverlet.collector" Version="6.0.2">
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
12+
<PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" />
13+
<PackageReference Include="MSTest.TestAdapter" />
14+
<PackageReference Include="MSTest.TestFramework" />
15+
<PackageReference Include="coverlet.collector">
1816
<PrivateAssets>all</PrivateAssets>
1917
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2018
</PackageReference>
21-
<PackageReference Include="Serilog" Version="4.0.1" />
22-
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
23-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
24-
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
19+
<PackageReference Include="Serilog" />
20+
<PackageReference Include="Serilog.Extensions.Hosting" />
21+
<PackageReference Include="Serilog.Extensions.Logging" />
22+
<PackageReference Include="Serilog.Sinks.Debug" />
2523
</ItemGroup>
2624

2725
<ItemGroup>
@@ -30,7 +28,4 @@
3028
<ProjectReference Include="..\MigrationTools\MigrationTools.csproj" />
3129
</ItemGroup>
3230

33-
<ItemGroup>
34-
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
35-
</ItemGroup>
3631
</Project>

0 commit comments

Comments
 (0)