Skip to content

Commit 3002c44

Browse files
JakeGinnivanJakeGinnivan
committed
Removed jetbrains.annotations due to linux build errors and fixed vso build
1 parent bc74ac2 commit 3002c44

File tree

15 files changed

+29
-43
lines changed

15 files changed

+29
-43
lines changed

‎src/GitVersionCore/AssemblyInfo.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33

44
[assembly: AssemblyTitle("GitVersionCore")]
55
[assembly: AssemblyProduct("GitVersion")]
6-
[assembly: AssemblyVersion("1.0.0")]
7-
[assembly: AssemblyFileVersion("1.0.0")]
6+
[assembly: AssemblyVersion("4.0.0.0")]
7+
[assembly: AssemblyFileVersion("4.0.0.0")]
88
[assembly: InternalsVisibleTo("GitVersionTask.Tests")]
99
[assembly: InternalsVisibleTo("GitVersion")]
1010
[assembly: InternalsVisibleTo("GitVersionCore.Tests")]
1111
[assembly: InternalsVisibleTo("GitVersionExe.Tests")]
12+
13+
[assembly: AssemblyInformationalVersion("4.0.0-beta.12+1291.Branch.master.Sha.bc74ac2247d8a58053a33316334ada6b771a8455")]

‎src/GitVersionCore/BranchConfigurationCalculator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
namespace GitVersion
22
{
3-
using JetBrains.Annotations;
43
using LibGit2Sharp;
54
using System;
65
using System.Collections.Generic;
@@ -45,7 +44,7 @@ public static BranchConfig GetBranchConfiguration(GitVersionContext context, Bra
4544
branchConfiguration;
4645
}
4746

48-
static IEnumerable<BranchConfig> LookupBranchConfiguration([NotNull] Config config, [NotNull] Branch currentBranch)
47+
static IEnumerable<BranchConfig> LookupBranchConfiguration(Config config, Branch currentBranch)
4948
{
5049
if (config == null)
5150
{

‎src/GitVersionCore/Extensions/ExtensionMethods.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ namespace GitVersion
44
using System.Collections.Generic;
55
using System.Text;
66
using System.Text.RegularExpressions;
7-
using JetBrains.Annotations;
87

98
static class ExtensionMethods
109
{
11-
[StringFormatMethod("format")]
1210
public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object[] args)
1311
{
1412
stringBuilder.AppendFormat(format, args);

‎src/GitVersionCore/FodyWeavers.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers VerifyAssembly="true">
3-
<Caseless/>
4-
<JetBrainsAnnotations/>
5-
<Visualize/>
3+
<Caseless />
4+
<Visualize />
65
</Weavers>

‎src/GitVersionCore/GitRepoMetadataProvider.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using JetBrains.Annotations;
2-
using LibGit2Sharp;
1+
using LibGit2Sharp;
32
using System;
43
using System.Collections.Generic;
54
using System.Linq;
@@ -52,7 +51,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string
5251
}
5352

5453
// TODO Should we cache this?
55-
public IEnumerable<Branch> GetBranchesContainingCommit([NotNull] Commit commit, IList<Branch> branches, bool onlyTrackedBranches)
54+
public IEnumerable<Branch> GetBranchesContainingCommit(Commit commit, IList<Branch> branches, bool onlyTrackedBranches)
5655
{
5756
if (commit == null)
5857
{
@@ -174,7 +173,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
174173
/// Find the commit where the given branch was branched from another branch.
175174
/// If there are multiple such commits and branches, returns the newest commit.
176175
/// </summary>
177-
public BranchCommit FindCommitBranchWasBranchedFrom([NotNull] Branch branch, params Branch[] excludedBranches)
176+
public BranchCommit FindCommitBranchWasBranchedFrom(Branch branch, params Branch[] excludedBranches)
178177
{
179178
if (branch == null)
180179
{

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
<HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
47-
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.5.0\lib\JetBrains.Annotations.dll</HintPath>
48-
<Private>False</Private>
49-
</Reference>
5046
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
5147
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20160922233542\lib\net40\LibGit2Sharp.dll</HintPath>
5248
<Private>True</Private>

‎src/GitVersionCore/LibGitExtensions.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ namespace GitVersion
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Linq;
7-
using JetBrains.Annotations;
87

98
using LibGit2Sharp;
109

@@ -34,15 +33,15 @@ public static bool IsSameBranch(this Branch branch, Branch otherBranch)
3433
/// <summary>
3534
/// Exclude the given branches (by value equality according to friendly name).
3635
/// </summary>
37-
public static IEnumerable<BranchCommit> ExcludingBranches([NotNull] this IEnumerable<BranchCommit> branches, [NotNull] IEnumerable<Branch> branchesToExclude)
36+
public static IEnumerable<BranchCommit> ExcludingBranches(this IEnumerable<BranchCommit> branches, IEnumerable<Branch> branchesToExclude)
3837
{
3938
return branches.Where(b => branchesToExclude.All(bte => !IsSameBranch(b.Branch, bte)));
4039
}
4140

4241
/// <summary>
4342
/// Exclude the given branches (by value equality according to friendly name).
4443
/// </summary>
45-
public static IEnumerable<Branch> ExcludingBranches([NotNull] this IEnumerable<Branch> branches, [NotNull] IEnumerable<Branch> branchesToExclude)
44+
public static IEnumerable<Branch> ExcludingBranches( this IEnumerable<Branch> branches, IEnumerable<Branch> branchesToExclude)
4645
{
4746
return branches.Where(b => branchesToExclude.All(bte => !IsSameBranch(b, bte)));
4847
}

‎src/GitVersionCore/VersionAssemblyInfoResources/AssemblyVersionInfoTemplates.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.IO;
66
using System.Linq;
77
using GitVersionCore.Extensions;
8-
using JetBrains.Annotations;
98

109
public class AssemblyVersionInfoTemplates
1110
{
@@ -38,7 +37,7 @@ public static string GetAssemblyInfoTemplateFor(string assemblyInfoFile)
3837
return null;
3938
}
4039

41-
public static string GetAssemblyInfoAddFormatFor([NotNull] string fileExtension)
40+
public static string GetAssemblyInfoAddFormatFor(string fileExtension)
4241
{
4342
if (fileExtension == null)
4443
throw new ArgumentNullException("fileExtension");
@@ -50,7 +49,7 @@ public static string GetAssemblyInfoAddFormatFor([NotNull] string fileExtension)
5049
return assemblyInfoAddFormat;
5150
}
5251

53-
public static bool IsSupported([NotNull] string fileExtension)
52+
public static bool IsSupported(string fileExtension)
5453
{
5554
if (fileExtension == null)
5655
throw new ArgumentNullException("fileExtension");

‎src/GitVersionCore/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
6-
<package id="JetBrainsAnnotations.Fody" version="1.0.5.0" targetFramework="net40" developmentDependency="true" />
76
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net40" />
87
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net40" />
98
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />

‎src/GitVersionExe/AssemblyInfo.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33

44
[assembly: AssemblyTitle("GitVersion")]
55
[assembly: AssemblyProduct("GitVersion")]
6-
[assembly: AssemblyVersion("1.0.0")]
7-
[assembly: AssemblyFileVersion("1.0.0")]
6+
[assembly: AssemblyVersion("4.0.0.0")]
7+
[assembly: AssemblyFileVersion("4.0.0.0")]
88
[assembly: InternalsVisibleTo("GitVersionTask.Tests")]
99
[assembly: InternalsVisibleTo("AcceptanceTests")]
1010
[assembly: InternalsVisibleTo("GitVersionExe.Tests")]
11+
12+
[assembly: AssemblyInformationalVersion("4.0.0-beta.12+1291.Branch.master.Sha.bc74ac2247d8a58053a33316334ada6b771a8455")]

0 commit comments

Comments
 (0)