Skip to content

Commit f64815b

Browse files
arturcicarturcic
committed
cleanup
1 parent e65d3ad commit f64815b

File tree

13 files changed

+69
-68
lines changed

13 files changed

+69
-68
lines changed

‎build.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ Task("Format")
239239
.Does<BuildParameters>((parameters) =>
240240
{
241241
var dotnetFormatExe = Context.Tools.Resolve("dotnet-format.exe");
242-
var args = $"--folder {parameters.Paths.Directories.Root}";
242+
var args = $"{parameters.Paths.Directories.Root} --folder --exclude **/AddFormats/";
243243
Context.ExecuteCommand(dotnetFormatExe, args);
244244
});
245245

‎build/utils/utils.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameter
170170

171171
FilePath GetGitVersionToolLocation(BuildParameters parameters)
172172
{
173-
return GetFiles($"src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion31}/gitversion.dll").SingleOrDefault();
173+
return GetFiles($"src/GitVersionExe/bin/{parameters.Configuration}/{parameters.NetVersion50}/gitversion.dll").SingleOrDefault();
174174
}
175175

176176
void Build(BuildParameters parameters)

‎src/Directory.Build.props

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
4747

4848
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
49-
<PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_NewtonsoftJson)" />
5049
<PackageReference Include="NSubstitute" Version="$(PackageVersion_NSubstitute)" />
5150

5251
<PackageReference Include="NUnit" Version="$(PackageVersion_NUnit)" />

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

+17-17
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Buildalyzer" Version="3.1.1" />
11-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
12-
<PackageReference Include="Microsoft.Build" Version="$(PackageVersion_MsBuild)" />
13-
<PackageReference Include="MSBuild.ProjectCreation" Version="2.0.1" />
10+
<PackageReference Include="Buildalyzer" Version="3.1.1"/>
11+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)"/>
12+
<PackageReference Include="Microsoft.Build" Version="$(PackageVersion_MsBuild)"/>
13+
<PackageReference Include="MSBuild.ProjectCreation" Version="2.0.1"/>
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\GitVersion.MsBuild\GitVersion.MsBuild.csproj" />
18-
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
17+
<ProjectReference Include="..\GitVersion.MsBuild\GitVersion.MsBuild.csproj"/>
18+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj"/>
1919
</ItemGroup>
2020
<ItemGroup>
21-
<Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
22-
<Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
23-
<Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs" />
24-
<Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs" />
25-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
26-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs" />
27-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
28-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
29-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
30-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
21+
<Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs"/>
22+
<Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs"/>
23+
<Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs"/>
24+
<Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs"/>
25+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs"/>
26+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs"/>
27+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs"/>
28+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs"/>
29+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs"/>
30+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs"/>
3131

32-
<Compile Include="..\GitVersionCore.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs" />
32+
<Compile Include="..\GitVersionCore.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs"/>
3333
</ItemGroup>
3434
</Project>

‎src/GitVersion.MsBuild/GitVersion.MsBuild.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(PackageVersion_MsBuild)" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" PrivateAssets="All" />
16+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(PackageVersion_MsBuild)"/>
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" PrivateAssets="All"/>
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" PrivateAssets="All" />
21+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" PrivateAssets="All"/>
2222
</ItemGroup>
2323

24-
<Import Project="nuget-files.props" />
24+
<Import Project="nuget-files.props"/>
2525

2626
</Project>

‎src/GitVersionCore/BuildAgents/AppVeyor.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Net.Http;
33
using System.Text;
4-
using GitVersion.Helpers;
54
using GitVersion.Logging;
65
using GitVersion.OutputVariables;
6+
using Newtonsoft.Json;
77

88
namespace GitVersion.BuildAgents
99
{
@@ -28,7 +28,7 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
2828
version = $"{variables.FullSemVer}.build.{buildNumber}",
2929
};
3030

31-
var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
31+
var stringContent = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
3232
var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
3333
response.EnsureSuccessStatusCode();
3434

@@ -45,7 +45,7 @@ public override string[] GenerateSetParameterMessage(string name, string value)
4545
value = $"{value}"
4646
};
4747

48-
var stringContent = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
48+
var stringContent = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
4949
var response = httpClient.PostAsync("api/build/variables", stringContent).GetAwaiter().GetResult();
5050
response.EnsureSuccessStatusCode();
5151

‎src/GitVersionCore/GitVersionCore.csproj

+12-11
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
18-
19-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
20-
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(PackageVersion_MicrosoftExtensions)" />
22-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
23-
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
17+
<PackageReference Include="System.Net.Requests" Version="4.3.0"/>
18+
19+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)"/>
20+
<PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_NewtonsoftJson)" />
21+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All"/>
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(PackageVersion_MicrosoftExtensions)"/>
23+
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)"/>
24+
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)"/>
2425
</ItemGroup>
2526

2627
<ItemGroup>
27-
<Compile Remove="VersionConverters\*\AddFormats\**\*.*" />
28-
<Compile Remove="VersionConverters\*\Templates\**\*.*" />
28+
<Compile Remove="VersionConverters\*\AddFormats\**\*.*"/>
29+
<Compile Remove="VersionConverters\*\Templates\**\*.*"/>
2930
</ItemGroup>
3031

3132
<ItemGroup>
32-
<EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*" />
33-
<EmbeddedResource Include="VersionConverters\*\Templates\**\*.*" />
33+
<EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*"/>
34+
<EmbeddedResource Include="VersionConverters\*\Templates\**\*.*"/>
3435
</ItemGroup>
3536

3637
</Project>

‎src/GitVersionCore/Model/VersionVariables.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
using System.Collections.Generic;
44
using System.IO;
55
using System.Linq;
6-
using GitVersion.Helpers;
6+
using Newtonsoft.Json;
77
using YamlDotNet.Serialization;
88
using static GitVersion.Extensions.ObjectExtensions;
9+
using JsonSerializer = GitVersion.Helpers.JsonSerializer;
910

1011
namespace GitVersion.OutputVariables
1112
{
@@ -158,6 +159,12 @@ public static VersionVariables FromDictionary(IEnumerable<KeyValuePair<string, s
158159
return (VersionVariables)Activator.CreateInstance(type, ctorArgs);
159160
}
160161

162+
public static VersionVariables FromJson(string json)
163+
{
164+
var variablePairs = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
165+
return FromDictionary(variablePairs);
166+
}
167+
161168
public static VersionVariables FromFile(string filePath, IFileSystem fileSystem)
162169
{
163170
using var stream = fileSystem.OpenRead(filePath);

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

+15-15
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Mono.Cecil" Version="0.11.3" />
9+
<PackageReference Include="Mono.Cecil" Version="0.11.3"/>
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
13-
<ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj" />
12+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj"/>
13+
<ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj"/>
1414
</ItemGroup>
1515
<ItemGroup>
16-
<None Include="TestBuildFile.proj" />
16+
<None Include="TestBuildFile.proj"/>
1717
</ItemGroup>
1818
<ItemGroup>
19-
<Content Include="Approved\**\*.approved.txt" />
19+
<Content Include="Approved\**\*.approved.txt"/>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />
23-
<Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs" />
24-
<Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs" />
25-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs" />
26-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
27-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
28-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
29-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
30-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
31-
<Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
22+
<Compile Include="..\GitVersionCore.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs"/>
23+
<Compile Include="..\GitVersionCore.Tests\Helpers\PathHelper.cs" Link="Helpers\PathHelper.cs"/>
24+
<Compile Include="..\GitVersionCore.Tests\Helpers\RuntimeHelper.cs" Link="Helpers\RuntimeHelper.cs"/>
25+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEffectiveConfiguration.cs" Link="Helpers\TestEffectiveConfiguration.cs"/>
26+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs"/>
27+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs"/>
28+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs"/>
29+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs"/>
30+
<Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs"/>
31+
<Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs"/>
3232
</ItemGroup>
3333

3434
</Project>

‎src/GitVersionExe.Tests/Helpers/ExecutionResults.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
32
using GitVersion.OutputVariables;
4-
using Newtonsoft.Json;
53

64
namespace GitVersionExe.Tests
75
{
@@ -26,8 +24,7 @@ public virtual VersionVariables OutputVariables
2624
var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
2725
var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
2826

29-
var outputVariables = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
30-
return VersionVariables.FromDictionary(outputVariables);
27+
return VersionVariables.FromJson(json);
3128
}
3229
}
3330
}

‎src/GitVersionExe.Tests/Helpers/ProgramFixture.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using GitVersion.OutputVariables;
99
using GitVersionCore.Tests.Helpers;
1010
using Microsoft.Extensions.DependencyInjection;
11-
using Newtonsoft.Json;
1211

1312
namespace GitVersionExe.Tests
1413
{
@@ -94,8 +93,7 @@ public VersionVariables OutputVariables
9493
var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
9594
var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
9695

97-
var outputVariables = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
98-
return VersionVariables.FromDictionary(outputVariables);
96+
return VersionVariables.FromJson(json);
9997
}
10098
}
10199

‎src/GitVersionExe.Tests/JsonOutputOnBuildServerTest.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using GitTools.Testing;
44
using GitVersion.BuildAgents;
55
using GitVersion.OutputVariables;
6-
using Newtonsoft.Json;
76
using NUnit.Framework;
87
using Shouldly;
98

@@ -66,7 +65,7 @@ public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outp
6665
var filePath = Path.Combine(fixture.LocalRepositoryFixture.RepositoryPath, fileName);
6766
var json = File.ReadAllText(filePath);
6867

69-
var outputVariables = VersionVariables.FromDictionary(JsonConvert.DeserializeObject<Dictionary<string, string>>(json));
68+
var outputVariables = VersionVariables.FromJson(json);
7069
outputVariables.ShouldNotBeNull();
7170
outputVariables.FullSemVer.ShouldBeEquivalentTo(version);
7271
}

‎src/GitVersionExe/GitVersionExe.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup Condition="'$(TargetFramework)'=='net48'">
25-
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
26-
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
25+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"/>
26+
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)"/>
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(PackageVersion_MicrosoftExtensions)" />
31-
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(PackageVersion_MicrosoftExtensions)" />
30+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(PackageVersion_MicrosoftExtensions)"/>
31+
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(PackageVersion_MicrosoftExtensions)"/>
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
35+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj"/>
3636
</ItemGroup>
3737
</Project>

0 commit comments

Comments
 (0)