Skip to content

Commit 0d5c2f2

Browse files
asbjornuasbjornu
committed
Made AssemblyInfoFileUpdate support F# and VB and reworked all corresponding tests to test F# and VB as well.
1 parent 56eaf1a commit 0d5c2f2

File tree

16 files changed

+230
-243
lines changed

16 files changed

+230
-243
lines changed

‎src/GitVersionCore/VersionAssemblyInfoResources/AssemblyVersionInfoTemplates.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.IO;
66
using System.Linq;
77
using GitVersionCore.Extensions;
8+
using JetBrains.Annotations;
89

910
public class AssemblyVersionInfoTemplates
1011
{
@@ -29,6 +30,25 @@ public static string GetAssemblyInfoTemplateFor(string assemblyInfoFile)
2930
return null;
3031
}
3132

33+
public static string GetAssemblyInfoAddFormatFor([NotNull] string fileExtension)
34+
{
35+
if (fileExtension == null)
36+
throw new ArgumentNullException("fileExtension");
37+
38+
// TODO: It would be nice to do something a bit more clever here, like reusing the VersionAssemblyInfo.* templates somehow. @asbjornu
39+
switch (fileExtension.ToLowerInvariant())
40+
{
41+
case ".cs":
42+
return "[assembly: {0}]";
43+
case ".vb":
44+
return "<assembly: {0}>";
45+
case ".fs":
46+
return "[<assembly: {0}>]";
47+
}
48+
49+
throw new NotSupportedException(string.Format("Unknown file extension '{0}'.", fileExtension));
50+
}
51+
3252
private static IEnumerable<FileInfo> GetEmbeddedVersionAssemblyFiles()
3353
{
3454
var enclosingNamespace = typeof(AssemblyVersionInfoTemplates).Namespace;
@@ -43,4 +63,4 @@ private static IEnumerable<FileInfo> GetEmbeddedVersionAssemblyFiles()
4363
}
4464
}
4565
}
46-
}
66+
}

‎src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[assembly: AssemblyVersion("2.3.1.0")]
2+
[assembly: AssemblyFileVersion("2.3.1.0")]
3+
[assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")]

‎src/GitVersionExe.Tests/Approved/CSharp/AssemblyInfoFileUpdateTests.ShouldCreateCSharpAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt renamed to ‎src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

File renamed without changes.

‎src/GitVersionExe.Tests/Approved/CSharp/AssemblyInfoFileUpdateTests.ShouldCreateCSharpAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt renamed to ‎src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt

File renamed without changes.

‎src/GitVersionExe.Tests/Approved/CSharp/AssemblyInfoFileUpdateTests.ShouldCreateCSharpAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.AssemblyInfocs.approved.txt renamed to ‎src/GitVersionExe.Tests/Approved/cs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

File renamed without changes.

‎src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[<assembly: AssemblyVersion("2.3.1.0")>]
2+
[<assembly: AssemblyFileVersion("2.3.1.0")>]
3+
[<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>]

‎src/GitVersionExe.Tests/Approved/CSharp/AssemblyInfoFileUpdateTests.ShouldCreateCSharpAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.srcProjectPropertiesVersionAssemblyInfocs.approved.txt renamed to ‎src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
3-
// This code was generated by GitVersion.
3+
// This code was generated by GitVersion.
44
//
55
// You can modify this code as we will not overwrite it when re-executing GitVersion
66
// </auto-generated>
77
//------------------------------------------------------------------------------
88

9-
using System.Reflection;
9+
open System.Reflection
1010

11-
[assembly: AssemblyFileVersion("1.0.0.0")]
12-
[assembly: AssemblyVersion("1.0.0.0")]
13-
[assembly: AssemblyInformationalVersion("1.0.0")]
11+
[<assembly: AssemblyFileVersion("1.0.0.0")>]
12+
[<assembly: AssemblyVersion("1.0.0.0")>]
13+
[<assembly: AssemblyInformationalVersion("1.0.0")>]
14+
()

‎src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by GitVersion.
4+
//
5+
// You can modify this code as we will not overwrite it when re-executing GitVersion
6+
// </auto-generated>
7+
//------------------------------------------------------------------------------
8+
9+
open System.Reflection
10+
11+
[<assembly: AssemblyFileVersion("1.0.0.0")>]
12+
[<assembly: AssemblyVersion("1.0.0.0")>]
13+
[<assembly: AssemblyInformationalVersion("1.0.0")>]
14+
()

‎src/GitVersionExe.Tests/Approved/fs/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by GitVersion.
4+
//
5+
// You can modify this code as we will not overwrite it when re-executing GitVersion
6+
// </auto-generated>
7+
//------------------------------------------------------------------------------
8+
9+
open System.Reflection
10+
11+
[<assembly: AssemblyFileVersion("1.0.0.0")>]
12+
[<assembly: AssemblyVersion("1.0.0.0")>]
13+
[<assembly: AssemblyInformationalVersion("1.0.0")>]
14+
()

‎src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Assembly: AssemblyVersion("2.3.1.0")>
2+
<Assembly: AssemblyFileVersion("2.3.1.0")>
3+
<assembly: AssemblyInformationalVersion("2.3.1+3.Branch.foo.Sha.hash")>

‎src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
''------------------------------------------------------------------------------
2+
'' <auto-generated>
3+
'' This code was generated by GitVersion.
4+
''
5+
'' You can modify this code as we will not overwrite it when re-executing GitVersion
6+
'' </auto-generated>
7+
''------------------------------------------------------------------------------
8+
9+
Imports System.Reflection
10+
11+
<assembly: AssemblyFileVersion("1.0.0.0")>
12+
<assembly: AssemblyVersion("1.0.0.0")>
13+
<assembly: AssemblyInformationalVersion("1.0.0")>

‎src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
''------------------------------------------------------------------------------
2+
'' <auto-generated>
3+
'' This code was generated by GitVersion.
4+
''
5+
'' You can modify this code as we will not overwrite it when re-executing GitVersion
6+
'' </auto-generated>
7+
''------------------------------------------------------------------------------
8+
9+
Imports System.Reflection
10+
11+
<assembly: AssemblyFileVersion("1.0.0.0")>
12+
<assembly: AssemblyVersion("1.0.0.0")>
13+
<assembly: AssemblyInformationalVersion("1.0.0")>

‎src/GitVersionExe.Tests/Approved/vb/AssemblyInfoFileUpdateTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
''------------------------------------------------------------------------------
2+
'' <auto-generated>
3+
'' This code was generated by GitVersion.
4+
''
5+
'' You can modify this code as we will not overwrite it when re-executing GitVersion
6+
'' </auto-generated>
7+
''------------------------------------------------------------------------------
8+
9+
Imports System.Reflection
10+
11+
<assembly: AssemblyFileVersion("1.0.0.0")>
12+
<assembly: AssemblyVersion("1.0.0.0")>
13+
<assembly: AssemblyInformationalVersion("1.0.0")>

0 commit comments

Comments
 (0)