Skip to content

Commit 0c60e65

Browse files
committed
moved AssemblyInfoUpdater/WixUpdater to VersionConverters folder
1 parent f25a268 commit 0c60e65

29 files changed

+47
-53
lines changed

src/GitVersionCore.Tests/VersionConverters/AssemblyInfoFileUpdaterTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Linq;
55
using GitVersion;
66
using GitVersion.Extensions;
7-
using GitVersion.Extensions.VersionAssemblyInfoResources;
87
using GitVersion.Logging;
98
using GitVersion.OutputVariables;
109
using GitVersion.VersionCalculation;
10+
using GitVersion.VersionConverters.VersionAssemblyInfoResources;
1111
using GitVersionCore.Tests.Helpers;
1212
using Microsoft.Extensions.DependencyInjection;
1313
using NSubstitute;

src/GitVersionCore.Tests/VersionConverters/GitVersionInformationGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.IO;
33
using GitVersion;
4-
using GitVersion.Extensions.GitVersionInformationResources;
54
using GitVersion.VersionCalculation;
5+
using GitVersion.VersionConverters.GitVersionInformationResources;
66
using GitVersionCore.Tests.Helpers;
77
using Microsoft.Extensions.DependencyInjection;
88
using NUnit.Framework;

src/GitVersionCore.Tests/VersionConverters/WixFileTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
using System.IO;
33
using System.Text;
44
using GitVersion;
5-
using GitVersion.Extensions;
65
using GitVersion.Logging;
76
using GitVersion.VersionCalculation;
7+
using GitVersion.VersionConverters.WixUpdater;
88
using GitVersionCore.Tests.Helpers;
99
using Microsoft.Extensions.DependencyInjection;
1010
using NUnit.Framework;

src/GitVersionCore/Core/GitVersionTool.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System;
22
using System.Linq;
3-
using GitVersion.Extensions;
4-
using GitVersion.Extensions.GitVersionInformationResources;
5-
using GitVersion.Extensions.VersionAssemblyInfoResources;
63
using GitVersion.Logging;
74
using GitVersion.Model;
85
using GitVersion.OutputVariables;
96
using GitVersion.VersionCalculation;
107
using GitVersion.VersionCalculation.Cache;
8+
using GitVersion.VersionConverters.GitVersionInformationResources;
9+
using GitVersion.VersionConverters.VersionAssemblyInfoResources;
10+
using GitVersion.VersionConverters.WixUpdater;
1111
using Microsoft.Extensions.Options;
1212

1313
namespace GitVersion

src/GitVersionCore/Extensions/AssemblyFileVersioningScheme.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/GitVersionCore/Extensions/AssemblyVersioningScheme.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/GitVersionCore/Extensions/AssemblyVersionsGenerator.cs renamed to src/GitVersionCore/Extensions/AssemblyVersionsGeneratorExtensions.cs

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,27 @@
22

33
namespace GitVersion.Extensions
44
{
5-
public static class AssemblyVersionsGenerator
5+
public enum AssemblyFileVersioningScheme
66
{
7-
public static string GetAssemblyVersion(
8-
this SemanticVersion sv,
9-
AssemblyVersioningScheme scheme)
7+
MajorMinorPatchTag,
8+
MajorMinorPatch,
9+
MajorMinor,
10+
Major,
11+
None
12+
}
13+
14+
public enum AssemblyVersioningScheme
15+
{
16+
MajorMinorPatchTag,
17+
MajorMinorPatch,
18+
MajorMinor,
19+
Major,
20+
None
21+
}
22+
23+
public static class AssemblyVersionsGeneratorExtensions
24+
{
25+
public static string GetAssemblyVersion(this SemanticVersion sv, AssemblyVersioningScheme scheme)
1026
{
1127
return scheme switch
1228
{
@@ -19,9 +35,7 @@ public static string GetAssemblyVersion(
1935
};
2036
}
2137

22-
public static string GetAssemblyFileVersion(
23-
this SemanticVersion sv,
24-
AssemblyFileVersioningScheme scheme)
38+
public static string GetAssemblyFileVersion(this SemanticVersion sv, AssemblyFileVersioningScheme scheme)
2539
{
2640
return scheme switch
2741
{

src/GitVersionCore/GitVersionCore.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<Compile Remove="Extensions\GitVersionInformationResources\AddFormats\**\*.*" />
32-
<Compile Remove="Extensions\GitVersionInformationResources\Templates\**\*.*" />
33-
<Compile Remove="Extensions\VersionAssemblyInfoResources\AddFormats\**\*.*" />
34-
<Compile Remove="Extensions\VersionAssemblyInfoResources\Templates\**\*.*" />
31+
<Compile Remove="VersionConverters\GitVersionInformationResources\AddFormats\**\*.*" />
32+
<Compile Remove="VersionConverters\GitVersionInformationResources\Templates\**\*.*" />
33+
<Compile Remove="VersionConverters\VersionAssemblyInfoResources\AddFormats\**\*.*" />
34+
<Compile Remove="VersionConverters\VersionAssemblyInfoResources\Templates\**\*.*" />
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<EmbeddedResource Include="Extensions\GitVersionInformationResources\AddFormats\**\*.*" />
39-
<EmbeddedResource Include="Extensions\GitVersionInformationResources\Templates\**\*.*" />
40-
<EmbeddedResource Include="Extensions\VersionAssemblyInfoResources\AddFormats\**\*.*" />
41-
<EmbeddedResource Include="Extensions\VersionAssemblyInfoResources\Templates\**\*.*" />
38+
<EmbeddedResource Include="VersionConverters\GitVersionInformationResources\AddFormats\**\*.*" />
39+
<EmbeddedResource Include="VersionConverters\GitVersionInformationResources\Templates\**\*.*" />
40+
<EmbeddedResource Include="VersionConverters\VersionAssemblyInfoResources\AddFormats\**\*.*" />
41+
<EmbeddedResource Include="VersionConverters\VersionAssemblyInfoResources\Templates\**\*.*" />
4242
</ItemGroup>
4343

4444
</Project>

src/GitVersionCore/GitVersionCoreModule.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
using GitVersion.Configuration;
55
using GitVersion.Configuration.Init;
66
using GitVersion.Extensions;
7-
using GitVersion.Extensions.GitVersionInformationResources;
8-
using GitVersion.Extensions.VersionAssemblyInfoResources;
97
using GitVersion.Logging;
108
using GitVersion.VersionCalculation;
119
using GitVersion.VersionCalculation.Cache;
10+
using GitVersion.VersionConverters.GitVersionInformationResources;
11+
using GitVersion.VersionConverters.VersionAssemblyInfoResources;
12+
using GitVersion.VersionConverters.WixUpdater;
1213
using LibGit2Sharp;
1314
using Microsoft.Extensions.DependencyInjection;
1415
using Microsoft.Extensions.Options;

0 commit comments

Comments
 (0)